HttpServer: allows sending raw response data for nontypical responses.

net/server/http_server_unittest.cc

Index: net/server/http_server_unittest.cc
diff --git a/net/server/http_server_unittest.cc b/net/server/http_server_unittest.cc
index 1de2100ab68fc20a5ba409a635cf11b060afc6cc..dd8ce79d7d645225f26f45803381a7a6a1a98f90 100644
--- a/net/server/http_server_unittest.cc
+++ b/net/server/http_server_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ -23,6 +24,7 @@
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
+#include "net/base/test_completion_callback.h"
 #include "net/server/http_server.h"
 #include "net/server/http_server_request_info.h"
 #include "net/socket/tcp_client_socket.h"
@@ -38,6 +40,8 @@ namespace net {
 
 namespace {
 
+const int kMaxExpectedResponseLength = 2048;
+
 void SetTimedOutAndQuitLoop(const base::WeakPtr<bool> timed_out,
                             const base::Closure& quit_loop_func) {
   if (timed_out) {
@@ -86,6 +90,15 @@ class TestHttpClient {
     Write();
   }
 
+  const std::string Read() {
+    net::TestCompletionCallback callback;
+    ReadInternal(callback.callback());
+    int bytes_received = callback.WaitForResult();
+    EXPECT_GT(bytes_received, 0);

[Ryan Sleevi, 2014/04/10 20:58:36]

This won't do what you want.

When this condition fails, the test will fail, yes, but it will continue
executing. When it gets to line 99, it's going to request a substr(0,
-some-negative-number), which won't do what you want.

Handle this here (eg: if (bytes_received < 0) return std::string()), it seems,
and EXPECT_()/ASSERT_() in the calling function?

[gunsch, 2014/04/11 16:55:57]

Interesting, guess I was still expecting the Java/JUnit style of "drop an assert
anywhere and the test exits if it fails." Updated.

+    std::string io_buffer_contents(read_buffer_->data());
+    return io_buffer_contents.substr(0, bytes_received);
+  }
+
  private:
   void OnConnect(const base::Closure& quit_loop, int result) {
     connect_result_ = result;
@@ -108,6 +121,16 @@ class TestHttpClient {
       Write();
   }
 
+  void ReadInternal(const net::CompletionCallback& callback) {
+    read_buffer_ = new IOBufferWithSize(kMaxExpectedResponseLength);
+    int result = socket_->Read(read_buffer_,
+                               kMaxExpectedResponseLength,
+                               callback);
+    if (result != ERR_IO_PENDING)
+      callback.Run(result);
+  }
+
+  scoped_refptr<IOBufferWithSize> read_buffer_;
   scoped_refptr<DrainableIOBuffer> write_buffer_;
   scoped_ptr<TCPClientSocket> socket_;
   int connect_result_;
@@ -128,7 +151,7 @@ class HttpServerTest : public testing::Test,
 
   virtual void OnHttpRequest(int connection_id,
                              const HttpServerRequestInfo& info) OVERRIDE {
-    requests_.push_back(info);
+    requests_.push_back(std::make_pair(info, connection_id));
     if (requests_.size() == quit_after_request_count_)
       run_loop_quit_func_.Run();
   }
@@ -157,11 +180,21 @@ class HttpServerTest : public testing::Test,
     return success;
   }
 
+  HttpServerRequestInfo GetRequest(size_t request_index) {
+    EXPECT_LE(request_index, requests_.size());

[Ryan Sleevi, 2014/04/10 20:58:36]

This doesn't really do what you want, for similar reasons as above. When you hit
line 185, you're going to crash the test if request_index > requests_.size()

Better to handle it here, or move this check into the calling function?

(Note: Don't replace these with DCHECK() - it would have the same effect for
test flakiness, as it would crash the test)

Normally you'd use ASSERT_LE(), but that requires a void return, and will only
terminate the test if it's in the test body (otherwise it would just "return")

see
https://code.google.com/p/googletest/wiki/AdvancedGuide#Propagating_Fatal_Fai...
to understand the patterns

[gunsch, 2014/04/11 16:55:57]

In that case, I'd rather remove these checks----it's a simple array index, and
the calling tests are already asserting that N requests were successfully made
(ASSERT_TRUE(RunUntilRequestsReceived)). I don't think propagating a success
boolean adds anything to the test for the extra complexity.

Thanks for the link though, that helps with the test paradigms generally.

+    return requests_[request_index].first;
+  }
+
+  int GetConnectionId(size_t request_index) {
+    EXPECT_LE(request_index, requests_.size());

[Ryan Sleevi, 2014/04/10 20:58:36]

Ditto; this doesn't do what you expect.

[gunsch, 2014/04/11 16:55:57]

Done.

+    return requests_[request_index].second;
+  }
+
  protected:
   scoped_refptr<HttpServer> server_;
   IPEndPoint server_address_;
   base::Closure run_loop_quit_func_;
-  std::vector<HttpServerRequestInfo> requests_;
+  std::vector<std::pair<HttpServerRequestInfo, int> > requests_;
 
  private:
   size_t quit_after_request_count_;
@@ -172,11 +205,13 @@ TEST_F(HttpServerTest, Request) {
   ASSERT_EQ(OK, client.ConnectAndWait(server_address_));
   client.Send("GET /test HTTP/1.1\r\n\r\n");
   ASSERT_TRUE(RunUntilRequestsReceived(1));
-  ASSERT_EQ("GET", requests_[0].method);
-  ASSERT_EQ("/test", requests_[0].path);
-  ASSERT_EQ("", requests_[0].data);
-  ASSERT_EQ(0u, requests_[0].headers.size());
-  ASSERT_TRUE(StartsWithASCII(requests_[0].peer.ToString(), "127.0.0.1", true));
+  ASSERT_EQ("GET", GetRequest(0).method);
+  ASSERT_EQ("/test", GetRequest(0).path);
+  ASSERT_EQ("", GetRequest(0).data);
+  ASSERT_EQ(0u, GetRequest(0).headers.size());
+  ASSERT_TRUE(StartsWithASCII(GetRequest(0).peer.ToString(),
+                              "127.0.0.1",
+                              true));
 }
 
 TEST_F(HttpServerTest, RequestWithHeaders) {
@@ -199,13 +234,13 @@ TEST_F(HttpServerTest, RequestWithHeaders) {
 
   client.Send("GET /test HTTP/1.1\r\n" + headers + "\r\n");
   ASSERT_TRUE(RunUntilRequestsReceived(1));
-  ASSERT_EQ("", requests_[0].data);
+  ASSERT_EQ("", GetRequest(0).data);
 
   for (size_t i = 0; i < arraysize(kHeaders); ++i) {
     std::string field = StringToLowerASCII(std::string(kHeaders[i][0]));
     std::string value = kHeaders[i][2];
-    ASSERT_EQ(1u, requests_[0].headers.count(field)) << field;
-    ASSERT_EQ(value, requests_[0].headers[field]) << kHeaders[i][0];
+    ASSERT_EQ(1u, GetRequest(0).headers.count(field)) << field;
+    ASSERT_EQ(value, GetRequest(0).headers[field]) << kHeaders[i][0];
   }
 }
 
@@ -220,8 +255,8 @@ TEST_F(HttpServerTest, RequestWithBody) {
       body.length(),
       body.c_str()));
   ASSERT_TRUE(RunUntilRequestsReceived(1));
-  ASSERT_EQ(2u, requests_[0].headers.size());
-  ASSERT_EQ(body.length(), requests_[0].data.length());
+  ASSERT_EQ(2u, GetRequest(0).headers.size());
+  ASSERT_EQ(body.length(), GetRequest(0).data.length());
   ASSERT_EQ('a', body[0]);
   ASSERT_EQ('c', *body.rbegin());
 }
@@ -261,6 +296,31 @@ TEST_F(HttpServerTest, RequestWithTooLargeBody) {
   ASSERT_EQ(0u, requests_.size());
 }
 
+TEST_F(HttpServerTest, Send200) {
+  TestHttpClient client;
+  ASSERT_EQ(OK, client.ConnectAndWait(server_address_));
+  client.Send("GET /test HTTP/1.1\r\n\r\n");
+  ASSERT_TRUE(RunUntilRequestsReceived(1));
+  server_->Send200(GetConnectionId(0), "Response!", "text/plain");
+
+  std::string response = client.Read();
+  ASSERT_TRUE(StartsWithASCII(response, "HTTP/1.1 200 OK", true));
+  ASSERT_TRUE(EndsWith(response, "Response!", true));
+}
+
+TEST_F(HttpServerTest, SendRaw) {
+  TestHttpClient client;
+  ASSERT_EQ(OK, client.ConnectAndWait(server_address_));
+  client.Send("GET /test HTTP/1.1\r\n\r\n");
+  ASSERT_TRUE(RunUntilRequestsReceived(1));
+  server_->SendRaw(GetConnectionId(0), "Raw Data ");
+  server_->SendRaw(GetConnectionId(0), "More Data");
+  server_->SendRaw(GetConnectionId(0), "Third Piece of Data");
+
+  std::string response = client.Read();
+  ASSERT_EQ("Raw Data More DataThird Piece of Data", response);
+}
+
 namespace {
 
 class MockStreamListenSocket : public StreamListenSocket {
@@ -281,17 +341,17 @@ TEST_F(HttpServerTest, RequestWithBodySplitAcrossPackets) {
       new MockStreamListenSocket(server_.get());
   server_->DidAccept(NULL, make_scoped_ptr(socket));
   std::string body("body");
-  std::string request = base::StringPrintf(
+  std::string request_text = base::StringPrintf(
       "GET /test HTTP/1.1\r\n"
       "SomeHeader: 1\r\n"
       "Content-Length: %" PRIuS "\r\n\r\n%s",
       body.length(),
       body.c_str());
-  server_->DidRead(socket, request.c_str(), request.length() - 2);
+  server_->DidRead(socket, request_text.c_str(), request_text.length() - 2);
   ASSERT_EQ(0u, requests_.size());
-  server_->DidRead(socket, request.c_str() + request.length() - 2, 2);
+  server_->DidRead(socket, request_text.c_str() + request_text.length() - 2, 2);
   ASSERT_EQ(1u, requests_.size());
-  ASSERT_EQ(body, requests_[0].data);
+  ASSERT_EQ(body, GetRequest(0).data);
 }
 
 TEST_F(HttpServerTest, MultipleRequestsOnSameConnection) {
@@ -306,15 +366,32 @@ TEST_F(HttpServerTest, MultipleRequestsOnSameConnection) {
       body.length(),
       body.c_str()));
   ASSERT_TRUE(RunUntilRequestsReceived(1));
-  ASSERT_EQ(body, requests_[0].data);
+  ASSERT_EQ(body, GetRequest(0).data);
+
+  int client_connection_id = GetConnectionId(0);
+  server_->Send200(client_connection_id, "Content for /test", "text/plain");
+  std::string response1 = client.Read();
+  ASSERT_TRUE(StartsWithASCII(response1, "HTTP/1.1 200 OK", true));
+  ASSERT_TRUE(EndsWith(response1, "Content for /test", true));
 
   client.Send("GET /test2 HTTP/1.1\r\n\r\n");
   ASSERT_TRUE(RunUntilRequestsReceived(2));
-  ASSERT_EQ("/test2", requests_[1].path);
+  ASSERT_EQ("/test2", GetRequest(1).path);
+
+  ASSERT_EQ(client_connection_id, GetConnectionId(1));
+  server_->Send404(client_connection_id);
+  std::string response2 = client.Read();
+  ASSERT_TRUE(StartsWithASCII(response2, "HTTP/1.1 404 Not Found", true));
 
   client.Send("GET /test3 HTTP/1.1\r\n\r\n");
   ASSERT_TRUE(RunUntilRequestsReceived(3));
-  ASSERT_EQ("/test3", requests_[2].path);
+  ASSERT_EQ("/test3", GetRequest(2).path);
+
+  ASSERT_EQ(client_connection_id, GetConnectionId(2));
+  server_->Send200(client_connection_id, "Content for /test3", "text/plain");
+  std::string response3 = client.Read();
+  ASSERT_TRUE(StartsWithASCII(response3, "HTTP/1.1 200 OK", true));
+  ASSERT_TRUE(EndsWith(response3, "Content for /test3", true));
 }
 
 }  // namespace net