commit 28b31f58c91f8b02d8f0de07fe4e773c2b6e67ea
author Alex Vakulenko <avakulenko@chromium.org> Mon Apr 28 12:40:05 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri May 02 10:49:26 2014 +0000
tree 31e38cfd266d35f6e140c77cbb1776a92d40371f
parent f85459118c547d5808f95e9d829908565e37efb3

buffet: add unit tests for http_utils

Added more unit tests for utility functions in http_utils.h

BUG=chromium:367379
TEST=Old and new unit tests pass.

Change-Id: I04e28691bc4db3980783c0033f5691087a8c6ab3
Reviewed-on: https://chromium-review.googlesource.com/197312
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>

buffet/http_connection_fake.cc

diff --git a/buffet/http_connection_fake.cc b/buffet/http_connection_fake.cc
index 6731aeb..0507c0b 100644
--- a/buffet/http_connection_fake.cc
+++ b/buffet/http_connection_fake.cc
@@ -67,7 +67,9 @@
 }
 
 uint64_t Connection::GetResponseDataSize() const {
-  return response_.GetData().size();
+  // HEAD requests must not return body.
+  return (request_.GetMethod() != request_type::kHead) ?
+      response_.GetData().size() : 0;
 }
 
 bool Connection::ReadResponseData(void* data, size_t buffer_size,
@@ -75,7 +77,8 @@
   size_t size_to_read = GetResponseDataSize() - response_data_ptr_;
   if (size_to_read > buffer_size)
     size_to_read = buffer_size;
-  memcpy(data, response_.GetData().data() + response_data_ptr_, size_to_read);
+  if (size_to_read > 0)
+    memcpy(data, response_.GetData().data() + response_data_ptr_, size_to_read);
   if (size_read)
     *size_read = size_to_read;
   response_data_ptr_ += size_to_read;