Separate Authenticator and Session unittests.

remoting/protocol/fake_session.h

 // Copyright (c) 2011 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.
 
 #ifndef REMOTING_PROTOCOL_FAKE_SESSION_H_
 #define REMOTING_PROTOCOL_FAKE_SESSION_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "net/socket/socket.h"
 #include "net/socket/stream_socket.h"
 #include "remoting/protocol/session.h"
 
 class MessageLoop;
 
 namespace remoting {
 namespace protocol {
 
 extern const char kTestJid[];
 
 // FakeSocket implement net::Socket interface for FakeConnection. All data
 // written to FakeSocket is stored in a buffer returned by written_data().
 // Read() reads data from another buffer that can be set with AppendInputData().
 // Pending reads are supported, so if there is a pending read AppendInputData()
 // calls the read callback.
 class FakeSocket : public net::StreamSocket {

[Wez, 2011/12/09 23:42:33]

nit: It strikes me that FakeSocket should probably become a class of paired
instances, e.g with

CreateFakeSocketPair(&a, &b)

so you to "prime" a FakeSocket w/ input data you'd just write to the other
end...

[Sergey Ulanov, 2011/12/12 22:52:00]

That would make test code more complicated because calling Read() or Write()
methods in Socket interface isn't as simple as accessing written_data() and
AppendInputData() in this class. Also this class provides access to low-level
details such as read_pending() and input_pos() which wouldn't be available with
regular socket.

  public:
   FakeSocket();
   virtual ~FakeSocket();
 
   const std::string& written_data() const { return written_data_; }
 
-  void AppendInputData(const char* data, int data_size);
+  void AppendInputData(const std::vector<char>& data);
+  void Connect(FakeSocket* peer_socket);

[Wez, 2011/12/09 23:42:33]

Isn't Connect() overloading net::StreamSocket::Connect()?  That seems bad/wrong?

[Sergey Ulanov, 2011/12/12 22:52:00]

Renamed to SetPeer(), though I disagree that overloading is a problem in this
case because the two Connect() methods are easy to distinguish.

[Wez, 2011/12/13 00:12:38]

True, but the semantics of this Connect() method are non-obvious; does
connecting given an existing FakeSocket create an equivalent connection, or make
the two peers?  SetPeer() seems clearer to me.

   int input_pos() const { return input_pos_; }
   bool read_pending() const { return read_pending_; }
 
   // net::Socket interface.
   virtual int Read(net::IOBuffer* buf, int buf_len,
                    net::OldCompletionCallback* callback) OVERRIDE;
   virtual int Write(net::IOBuffer* buf, int buf_len,
                     net::OldCompletionCallback* callback) OVERRIDE;
 
   virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
@@ skipping 12 matching lines @@
   virtual bool WasEverUsed() const OVERRIDE;
   virtual bool UsingTCPFastOpen() const OVERRIDE;
   virtual int64 NumBytesRead() const OVERRIDE;
   virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
 
  private:
   bool read_pending_;
   scoped_refptr<net::IOBuffer> read_buffer_;
   int read_buffer_size_;
   net::OldCompletionCallback* read_callback_;
+  base::WeakPtr<FakeSocket> peer_socket_;
 
   std::string written_data_;
   std::string input_data_;
   int input_pos_;
 
   net::BoundNetLog net_log_;
 
   MessageLoop* message_loop_;
+  base::WeakPtrFactory<FakeSocket> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeSocket);
 };
 
 // FakeUdpSocket is similar to FakeSocket but behaves as UDP socket. All written
 // packets are stored separetely in written_packets(). AppendInputPacket() adds
 // one packet that will be returned by Read().
 class FakeUdpSocket : public net::Socket {
  public:
   FakeUdpSocket();
@@ skipping 85 matching lines @@
   Session::Error error_;
   bool closed_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeSession);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_FAKE_SESSION_H_