CacheStorage: Implement Cache.matchAll()

content/browser/cache_storage/cache_storage_cache_unittest.cc

 // Copyright 2014 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.
 
 #include "content/browser/cache_storage/cache_storage_cache.h"
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
@@ skipping 104 matching lines @@
     int rv = backend_->OpenEntry(key, entry, callback);
     if (rv != net::ERR_IO_PENDING)
       callback.Run(rv);
   }
 
   scoped_ptr<disk_cache::Backend> backend_;
   bool delay_open_;
   base::Closure open_entry_callback_;
 };
 
+bool ResponsesEqual(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())

[jkarlin, 2015/08/05 12:09:05]

Can you compare the blob contents of the two responses with
CacheStorageCacheTest::CopyBody here? That would simplify the tests further.
You'd have to move CacheStorageCacheTest::CopyBody into the unnamed namespace,
which is better anyway.

[nhiroki, 2015/08/06 03:36:53]

Calling CopyBody() here might complicate this function because it requires two
more arguments (expected_body and actual_body_handle). Instead, I renamed this
function to "ResponseMetadataEqual()" and introduced a separate function
"ResponseBodiesEqual()" for comparing the blob contents. How does this look?

+      return false;
+  }
+
+  return true;
+}
+
 }  // namespace
 
 // A CacheStorageCache that can optionally delay during backend creation.
 class TestCacheStorageCache : public CacheStorageCache {
  public:
   TestCacheStorageCache(
       const GURL& origin,
       const base::FilePath& path,
       const scoped_refptr<net::URLRequestContextGetter>& request_context_getter,
       const scoped_refptr<storage::QuotaManagerProxy>& quota_manager_proxy,
@@ skipping 153 matching lines @@
 
     cache_->Match(
         CopyFetchRequest(request),
         base::Bind(&CacheStorageCacheTest::ResponseAndErrorCallback,
                    base::Unretained(this), base::Unretained(loop.get())));
     loop->Run();
 
     return callback_error_ == CACHE_STORAGE_OK;
   }
 
+  bool MatchAll(std::vector<ServiceWorkerResponse>* 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;
     operation.request = request;
 
     CacheStorageError error =
         BatchOperation(std::vector<CacheStorageBatchOperation>(1, operation));
     return error == CACHE_STORAGE_OK;
   }
 
@@ skipping 55 matching lines @@
     callback_error_ = error;
     callback_response_ = response.Pass();
     callback_response_data_.reset();
     if (error == CACHE_STORAGE_OK && !callback_response_->blob_uuid.empty())
       callback_response_data_ = body_handle.Pass();
 
     if (run_loop)
       run_loop->Quit();
   }
 
+  void ResponsesAndErrorCallback(
+      const base::Closure& quit_closure,
+      std::vector<ServiceWorkerResponse>* responses_out,
+      ScopedVector<storage::BlobDataHandle>* body_handles_out,
+      CacheStorageError error,
+      const std::vector<ServiceWorkerResponse>& responses,
+      ScopedVector<storage::BlobDataHandle> body_handles) {
+    callback_error_ = error;
+    *responses_out = responses;
+    body_handles_out->swap(body_handles);
+    quit_closure.Run();
+  }
+
   void CloseCallback(base::RunLoop* run_loop) {
     EXPECT_FALSE(callback_closed_);
     callback_closed_ = true;
     if (run_loop)
       run_loop->Quit();
   }
 
   void CopyBody(storage::BlobDataHandle* blob_handle, std::string* output) {
     *output = std::string();
     scoped_ptr<storage::BlobDataSnapshot> data = blob_handle->CreateSnapshot();
@@ skipping 230 matching lines @@
   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);
 
   std::string response_body;
   CopyBody(callback_response_data_.get(), &response_body);
   EXPECT_STREQ(expected_blob_data_.c_str(), response_body.c_str());
 }
 
+TEST_P(CacheStorageCacheTestP, MatchAll_Empty) {
+  std::vector<ServiceWorkerResponse> 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_));
+
+  std::vector<ServiceWorkerResponse> 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(ResponsesEqual(no_body_response_, responses[0]));
+  EXPECT_FALSE(body_handles[0]);
+}
+
+TEST_P(CacheStorageCacheTestP, MatchAll_Body) {
+  EXPECT_TRUE(Put(body_request_, body_response_));
+
+  std::vector<ServiceWorkerResponse> 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(ResponsesEqual(body_response_, responses[0]));
+  std::string response_body;
+  CopyBody(body_handles[0], &response_body);
+  EXPECT_STREQ(expected_blob_data_.c_str(), response_body.c_str());
+}
+
+TEST_P(CacheStorageCacheTestP, MatchAll_TwoResponsesThenOne) {
+  EXPECT_TRUE(Put(no_body_request_, no_body_response_));
+  EXPECT_TRUE(Put(body_request_, body_response_));
+
+  std::vector<ServiceWorkerResponse> 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[i].url.spec() == "http://example.com/no_body.html") {
+      EXPECT_TRUE(ResponsesEqual(no_body_response_, responses[i]));
+      EXPECT_FALSE(body_handles[i]);
+      matched_set.insert(responses[i].url.spec());
+    } else if (responses[i].url.spec() == "http://example.com/body.html") {
+      EXPECT_TRUE(ResponsesEqual(body_response_, responses[i]));
+      std::string response_body;
+      CopyBody(body_handles[i], &response_body);
+      EXPECT_STREQ(expected_blob_data_.c_str(), response_body.c_str());
+      matched_set.insert(responses[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));
+
+  ASSERT_EQ(1u, responses.size());
+  ASSERT_EQ(1u, body_handles.size());
+  EXPECT_TRUE(ResponsesEqual(no_body_response_, responses[0]));
+  EXPECT_FALSE(body_handles[0]);
+}
+
 TEST_P(CacheStorageCacheTestP, Vary) {
   body_request_.headers["vary_foo"] = "foo";
   body_response_.headers["vary"] = "vary_foo";
   EXPECT_TRUE(Put(body_request_, body_response_));
   EXPECT_TRUE(Match(body_request_));
 
   body_request_.headers["vary_foo"] = "bar";
   EXPECT_FALSE(Match(body_request_));
 
   body_request_.headers.erase("vary_foo");
@@ skipping 256 matching lines @@
   EXPECT_EQ(1, sequence_out);
   close_loop2->Run();
   EXPECT_EQ(2, sequence_out);
 }
 
 INSTANTIATE_TEST_CASE_P(CacheStorageCacheTest,
                         CacheStorageCacheTestP,
                         ::testing::Values(false, true));
 
 }  // namespace content