Modify DeterministicSocketData to verify that the sequence number of reads and writes start at zero…

net/socket/socket_test_util.h

 // 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.
 
 #ifndef NET_SOCKET_SOCKET_TEST_UTIL_H_
 #define NET_SOCKET_SOCKET_TEST_UTIL_H_
 
 #include <cstring>
 #include <deque>
 #include <string>
@@ skipping 199 matching lines @@
   bool at_read_eof() const { return read_index_ >= read_count_; }
   bool at_write_eof() const { return write_index_ >= write_count_; }
 
   virtual void CompleteRead() {}
 
   // SocketDataProvider implementation.
   virtual MockRead GetNextRead() OVERRIDE;
   virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE;
   virtual void Reset() OVERRIDE;
 
+ protected:
+  StaticSocketDataProvider(bool verify_sequence_numbers,
+                           MockRead* reads, size_t reads_count,
+                           MockWrite* writes, size_t writes_count);

[Ryan Sleevi, 2012/07/18 18:02:13]

Is there a reason this isn't the default behaviour?

It seems troublesome to introduce an overloaded constructor that differs on only
the bool, and it's not clear from this CL what it buys. After all, the omitted
path is the same as verify_sequence_numbers == false

Alternatively, if this is only for DeterministicSocketDataProvider, I would move
this method there and have it handle checking inputs itself.

[Ryan Hamilton, 2012/07/18 18:45:06]

It's not the default behavior because StaticSocketDataProvider doesn't really
need sequence numbers.  It's really only the Deterministic version which does. 
(And also Ordered, but that is evil).
Fair enough, though I did not want to change all of the places where we
construct StaticSocketDataProviders in all the tests.
 
Ah, ok.  So I actually started off trying to do that, but reads_ and writes_ are
private, not protected so they are not visible to Deterministic.  How bout I
simply make the Verify() method protected, and call it in the Deterministic
constructor.

+
  private:
+  void VerifyCorrectSequenceNumbers();
+
   MockRead* reads_;
   size_t read_index_;
   size_t read_count_;
   MockWrite* writes_;
   size_t write_index_;
   size_t write_count_;
 
   DISALLOW_COPY_AND_ASSIGN(StaticSocketDataProvider);
 };
 
@@ skipping 816 matching lines @@
 
 extern const char kSOCKS5OkRequest[];
 extern const int kSOCKS5OkRequestLength;
 
 extern const char kSOCKS5OkResponse[];
 extern const int kSOCKS5OkResponseLength;
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SOCKET_TEST_UTIL_H_