CacheStorage: Implement Cache.matchAll()

content/browser/cache_storage/cache_storage_cache_unittest.cc

Index: content/browser/cache_storage/cache_storage_cache_unittest.cc
diff --git a/content/browser/cache_storage/cache_storage_cache_unittest.cc b/content/browser/cache_storage/cache_storage_cache_unittest.cc
index ec4208b2a1d4c0977b0d83a1269dab89d5912977..7142e45f51fd57d9fc3d43fc5f9d434954770417 100644
--- a/content/browser/cache_storage/cache_storage_cache_unittest.cc
+++ b/content/browser/cache_storage/cache_storage_cache_unittest.cc
@@ -122,6 +122,75 @@ class DelayableBackend : public disk_cache::Backend {
   base::Closure open_entry_callback_;
 };
 
+void CopyBody(storage::BlobDataHandle* blob_handle, std::string* output) {
+  *output = std::string();
+  scoped_ptr<storage::BlobDataSnapshot> data = blob_handle->CreateSnapshot();
+  const auto& items = data->items();
+  for (const auto& item : items) {
+    switch (item->type()) {
+      case storage::DataElement::TYPE_BYTES: {
+        output->append(item->bytes(), item->length());
+        break;
+      }
+      case storage::DataElement::TYPE_DISK_CACHE_ENTRY: {
+        disk_cache::Entry* entry = item->disk_cache_entry();
+        int32 body_size = entry->GetDataSize(item->disk_cache_stream_index());
+
+        scoped_refptr<net::IOBuffer> io_buffer = new net::IOBuffer(body_size);
+        net::TestCompletionCallback callback;
+        int rv =
+            entry->ReadData(item->disk_cache_stream_index(), 0, io_buffer.get(),
+                            body_size, callback.callback());
+        if (rv == net::ERR_IO_PENDING)
+          rv = callback.WaitForResult();
+        EXPECT_EQ(body_size, rv);
+        if (rv > 0)
+          output->append(io_buffer->data(), rv);
+        break;
+      }
+      default: { ADD_FAILURE() << "invalid response blob type"; } break;
+    }
+  }
+}
+
+bool ResponseMetadataEqual(const ServiceWorkerResponse& expected,
+                           const ServiceWorkerResponse& actual) {
+  EXPECT_EQ(expected.status_code, actual.status_code);
+  if (expected.status_code != actual.status_code)
+    return false;
+  EXPECT_EQ(expected.status_text, actual.status_text);
+  if (expected.status_text != actual.status_text)
+    return false;
+  EXPECT_EQ(expected.url, actual.url);
+  if (expected.url != actual.url)
+    return false;
+  EXPECT_EQ(expected.blob_size, actual.blob_size);
+  if (expected.blob_size != actual.blob_size)
+    return false;
+
+  if (expected.blob_size == 0) {
+    EXPECT_STREQ("", actual.blob_uuid.c_str());
+    if (!actual.blob_uuid.empty())
+      return false;
+  } else {
+    EXPECT_STRNE("", actual.blob_uuid.c_str());
+    if (actual.blob_uuid.empty())
+      return false;
+  }
+
+  return true;
+}
+
+bool ResponseBodiesEqual(const std::string& expected_body,
+                         storage::BlobDataHandle* actual_body_handle) {
+  std::string actual_body;
+  CopyBody(actual_body_handle, &actual_body);
+  EXPECT_EQ(expected_body, actual_body);
+  if (expected_body != actual_body)

[jkarlin, 2015/08/06 15:11:13]

return expected_body == actual_body;

[nhiroki, 2015/08/07 13:12:16]

Done.

+    return false;
+  return true;
+}
+
 }  // namespace
 
 // A CacheStorageCache that can optionally delay during backend creation.
@@ -295,6 +364,16 @@ class CacheStorageCacheTest : public testing::Test {
     return callback_error_ == CACHE_STORAGE_OK;
   }
 
+  bool MatchAll(scoped_ptr<CacheStorageCache::Responses>* responses,
+                ScopedVector<storage::BlobDataHandle>* body_handles) {
+    base::RunLoop loop;
+    cache_->MatchAll(base::Bind(
+        &CacheStorageCacheTest::ResponsesAndErrorCallback,
+        base::Unretained(this), loop.QuitClosure(), responses, body_handles));
+    loop.Run();
+    return callback_error_ == CACHE_STORAGE_OK;
+  }
+
   bool Delete(const ServiceWorkerFetchRequest& request) {
     CacheStorageBatchOperation operation;
     operation.operation_type = CACHE_STORAGE_CACHE_OPERATION_TYPE_DELETE;
@@ -370,6 +449,19 @@ class CacheStorageCacheTest : public testing::Test {
       run_loop->Quit();
   }
 
+  void ResponsesAndErrorCallback(
+      const base::Closure& quit_closure,
+      scoped_ptr<CacheStorageCache::Responses>* responses_out,
+      ScopedVector<storage::BlobDataHandle>* body_handles_out,
+      CacheStorageError error,
+      scoped_ptr<CacheStorageCache::Responses> responses,
+      ScopedVector<storage::BlobDataHandle> body_handles) {
+    callback_error_ = error;
+    responses_out->swap(responses);
+    body_handles_out->swap(body_handles);
+    quit_closure.Run();
+  }
+
   void CloseCallback(base::RunLoop* run_loop) {
     EXPECT_FALSE(callback_closed_);
     callback_closed_ = true;
@@ -377,37 +469,6 @@ class CacheStorageCacheTest : public testing::Test {
       run_loop->Quit();
   }
 
-  void CopyBody(storage::BlobDataHandle* blob_handle, std::string* output) {
-    *output = std::string();
-    scoped_ptr<storage::BlobDataSnapshot> data = blob_handle->CreateSnapshot();
-    const auto& items = data->items();
-    for (const auto& item : items) {
-      switch (item->type()) {
-        case storage::DataElement::TYPE_BYTES: {
-          output->append(item->bytes(), item->length());
-          break;
-        }
-        case storage::DataElement::TYPE_DISK_CACHE_ENTRY: {
-          disk_cache::Entry* entry = item->disk_cache_entry();
-          int32 body_size = entry->GetDataSize(item->disk_cache_stream_index());
-
-          scoped_refptr<net::IOBuffer> io_buffer = new net::IOBuffer(body_size);
-          net::TestCompletionCallback callback;
-          int rv =
-              entry->ReadData(item->disk_cache_stream_index(), 0,
-                              io_buffer.get(), body_size, callback.callback());
-          if (rv == net::ERR_IO_PENDING)
-            rv = callback.WaitForResult();
-          EXPECT_EQ(body_size, rv);
-          if (rv > 0)
-            output->append(io_buffer->data(), rv);
-          break;
-        }
-        default: { ADD_FAILURE() << "invalid response blob type"; } break;
-      }
-    }
-  }
-
   bool VerifyKeys(const std::vector<std::string>& expected_keys) {
     if (expected_keys.size() != callback_strings_.size())
       return false;
@@ -597,27 +658,87 @@ TEST_P(CacheStorageCacheTestP, PutReplcaceInBatch) {
 TEST_P(CacheStorageCacheTestP, MatchNoBody) {
   EXPECT_TRUE(Put(no_body_request_, no_body_response_));
   EXPECT_TRUE(Match(no_body_request_));
-  EXPECT_EQ(200, callback_response_->status_code);
-  EXPECT_STREQ("OK", callback_response_->status_text.c_str());
-  EXPECT_STREQ("http://example.com/no_body.html",
-               callback_response_->url.spec().c_str());
-  EXPECT_STREQ("", callback_response_->blob_uuid.c_str());
-  EXPECT_EQ(0u, callback_response_->blob_size);
+  EXPECT_TRUE(ResponseMetadataEqual(no_body_response_, *callback_response_));
+  EXPECT_FALSE(callback_response_data_);
 }
 
 TEST_P(CacheStorageCacheTestP, MatchBody) {
   EXPECT_TRUE(Put(body_request_, body_response_));
   EXPECT_TRUE(Match(body_request_));
-  EXPECT_EQ(200, callback_response_->status_code);
-  EXPECT_STREQ("OK", callback_response_->status_text.c_str());
-  EXPECT_STREQ("http://example.com/body.html",
-               callback_response_->url.spec().c_str());
-  EXPECT_STRNE("", callback_response_->blob_uuid.c_str());
-  EXPECT_EQ(expected_blob_data_.size(), callback_response_->blob_size);
+  EXPECT_TRUE(ResponseMetadataEqual(body_response_, *callback_response_));
+  EXPECT_TRUE(
+      ResponseBodiesEqual(expected_blob_data_, callback_response_data_.get()));
+}
+
+TEST_P(CacheStorageCacheTestP, MatchAll_Empty) {
+  scoped_ptr<CacheStorageCache::Responses> responses;
+  ScopedVector<storage::BlobDataHandle> body_handles;
+  EXPECT_TRUE(MatchAll(&responses, &body_handles));
+  EXPECT_TRUE(responses->empty());
+  EXPECT_TRUE(body_handles.empty());
+}
+
+TEST_P(CacheStorageCacheTestP, MatchAll_NoBody) {
+  EXPECT_TRUE(Put(no_body_request_, no_body_response_));
+
+  scoped_ptr<CacheStorageCache::Responses> responses;
+  ScopedVector<storage::BlobDataHandle> body_handles;
+  EXPECT_TRUE(MatchAll(&responses, &body_handles));
+  ASSERT_EQ(1u, responses->size());
+  ASSERT_EQ(1u, body_handles.size());
+
+  EXPECT_TRUE(ResponseMetadataEqual(no_body_response_, responses->at(0)));
+  EXPECT_FALSE(body_handles[0]);
+}
+
+TEST_P(CacheStorageCacheTestP, MatchAll_Body) {
+  EXPECT_TRUE(Put(body_request_, body_response_));
+
+  scoped_ptr<CacheStorageCache::Responses> responses;
+  ScopedVector<storage::BlobDataHandle> body_handles;
+  EXPECT_TRUE(MatchAll(&responses, &body_handles));
+  ASSERT_EQ(1u, responses->size());
+  ASSERT_EQ(1u, body_handles.size());
+
+  EXPECT_TRUE(ResponseMetadataEqual(body_response_, responses->at(0)));
+  EXPECT_TRUE(ResponseBodiesEqual(expected_blob_data_, body_handles[0]));
+}
+
+TEST_P(CacheStorageCacheTestP, MatchAll_TwoResponsesThenOne) {
+  EXPECT_TRUE(Put(no_body_request_, no_body_response_));
+  EXPECT_TRUE(Put(body_request_, body_response_));
+
+  scoped_ptr<CacheStorageCache::Responses> responses;
+  ScopedVector<storage::BlobDataHandle> body_handles;
+  EXPECT_TRUE(MatchAll(&responses, &body_handles));
+  ASSERT_EQ(2u, responses->size());
+  ASSERT_EQ(2u, body_handles.size());
+
+  // Order of returned responses is not guaranteed.
+  std::set<std::string> matched_set;
+  for (size_t i = 0; i < responses->size(); ++i) {
+    if (responses->at(i).url.spec() == "http://example.com/no_body.html") {
+      EXPECT_TRUE(ResponseMetadataEqual(no_body_response_, responses->at(i)));
+      EXPECT_FALSE(body_handles[i]);
+      matched_set.insert(responses->at(i).url.spec());
+    } else if (responses->at(i).url.spec() == "http://example.com/body.html") {
+      EXPECT_TRUE(ResponseMetadataEqual(body_response_, responses->at(i)));
+      EXPECT_TRUE(ResponseBodiesEqual(expected_blob_data_, body_handles[i]));
+      matched_set.insert(responses->at(i).url.spec());
+    }
+  }
+  EXPECT_EQ(2u, matched_set.size());
+
+  responses->clear();
+  body_handles.clear();
+
+  EXPECT_TRUE(Delete(body_request_));
+  EXPECT_TRUE(MatchAll(&responses, &body_handles));
 
-  std::string response_body;
-  CopyBody(callback_response_data_.get(), &response_body);
-  EXPECT_STREQ(expected_blob_data_.c_str(), response_body.c_str());
+  ASSERT_EQ(1u, responses->size());
+  ASSERT_EQ(1u, body_handles.size());
+  EXPECT_TRUE(ResponseMetadataEqual(no_body_response_, responses->at(0)));
+  EXPECT_FALSE(body_handles[0]);
 }
 
 TEST_P(CacheStorageCacheTestP, Vary) {