More groundwork for flat file based response storage.

webkit/appcache/appcache_url_request_job_unittest.cc

 // Copyright (c) 2011 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 <stack>
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/pickle.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 418 matching lines @@
     EXPECT_FALSE(job->has_been_started());
 
     job = new AppCacheURLRequestJob(&request, storage);
     job->DeliverNetworkResponse();
     EXPECT_TRUE(job->is_delivering_network_response());
     EXPECT_FALSE(job->has_been_started());
 
     job = new AppCacheURLRequestJob(&request, storage);
     const GURL kManifestUrl("http://blah/");
     const int64 kCacheId(1);
+    const int64 kGroupId(1);
     const AppCacheEntry kEntry(AppCacheEntry::EXPLICIT, 1);
-    job->DeliverAppCachedResponse(kManifestUrl, kCacheId, kEntry, false);
+    job->DeliverAppCachedResponse(kManifestUrl, kCacheId, kGroupId,
+                                  kEntry, false);
     EXPECT_FALSE(job->is_waiting());
     EXPECT_TRUE(job->is_delivering_appcache_response());
     EXPECT_FALSE(job->has_been_started());
     EXPECT_EQ(kManifestUrl, job->manifest_url());
     EXPECT_EQ(kCacheId, job->cache_id());
+    EXPECT_EQ(kGroupId, job->group_id());
     EXPECT_EQ(kEntry.types(), job->entry().types());
     EXPECT_EQ(kEntry.response_id(), job->entry().response_id());
 
     TestFinished();
   }
 
   // DeliverNetworkResponse --------------------------------------------------
 
   void DeliverNetworkResponse() {
     // This test has async steps.
@@ skipping 64 matching lines @@
     // This test has several async steps.
     // 1. Write a small response to response storage.
     // 2. Use net::URLRequest to retrieve it.
     // 3. Verify we received what we expected to receive.
 
     PushNextTask(NewRunnableMethod(
        this, &AppCacheURLRequestJobTest::VerifyDeliverSmallAppCachedResponse));
     PushNextTask(NewRunnableMethod(
        this, &AppCacheURLRequestJobTest::RequestAppCachedResource, false));
 
-    writer_.reset(service_->storage()->CreateResponseWriter(GURL()));
+    writer_.reset(service_->storage()->CreateResponseWriter(GURL(), 0));
     written_response_id_ = writer_->response_id();
     WriteBasicResponse();
     // Continues async
   }
 
   void RequestAppCachedResource(bool start_after_delivery_orders) {
     AppCacheStorage* storage = service_->storage();
     request_.reset(
         new net::URLRequest(GURL("http://blah/"), url_request_delegate_.get()));
 
     // Setup to create an AppCacheURLRequestJob with orders to deliver
     // a network response.
     scoped_refptr<AppCacheURLRequestJob> job(
         new AppCacheURLRequestJob(request_.get(), storage));
 
     if (start_after_delivery_orders) {
       job->DeliverAppCachedResponse(
-          GURL(), 111,
+          GURL(), 0, 111,
           AppCacheEntry(AppCacheEntry::EXPLICIT, written_response_id_),
           false);
       EXPECT_TRUE(job->is_delivering_appcache_response());
     }
 
     // Start the request.
     EXPECT_FALSE(job->has_been_started());
     mock_factory_job_ = job;
     request_->Start();
     EXPECT_FALSE(mock_factory_job_);
     EXPECT_TRUE(job->has_been_started());
 
     if (!start_after_delivery_orders) {
       job->DeliverAppCachedResponse(
-          GURL(), 111,
+          GURL(), 0, 111,
           AppCacheEntry(AppCacheEntry::EXPLICIT, written_response_id_),
           false);
       EXPECT_TRUE(job->is_delivering_appcache_response());
     }
 
     // Completion is async.
   }
 
   void VerifyDeliverSmallAppCachedResponse() {
     EXPECT_TRUE(request_->status().is_success());
@@ skipping 14 matching lines @@
     // This test has several async steps.
     // 1. Write a large response to response storage.
     // 2. Use net::URLRequest to retrieve it.
     // 3. Verify we received what we expected to receive.
 
     PushNextTask(NewRunnableMethod(
        this, &AppCacheURLRequestJobTest::VerifyDeliverLargeAppCachedResponse));
     PushNextTask(NewRunnableMethod(
        this, &AppCacheURLRequestJobTest::RequestAppCachedResource, true));
 
-    writer_.reset(service_->storage()->CreateResponseWriter(GURL()));
+    writer_.reset(service_->storage()->CreateResponseWriter(GURL(), 0));
     written_response_id_ = writer_->response_id();
     WriteLargeResponse();
     // Continues async
   }
 
   void WriteLargeResponse() {
     // 3, 1k blocks
     static const char kHttpHeaders[] =
         "HTTP/1.0 200 OK\0Content-Length: 3072\0\0";
     scoped_refptr<IOBuffer> body(new IOBuffer(kBlockSize * 3));
@@ skipping 20 matching lines @@
 
   void DeliverPartialResponse() {
     // This test has several async steps.
     // 1. Write a small response to response storage.
     // 2. Use net::URLRequest to retrieve it a subset using a range request
     // 3. Verify we received what we expected to receive.
     PushNextTask(NewRunnableMethod(
        this, &AppCacheURLRequestJobTest::VerifyDeliverPartialResponse));
     PushNextTask(NewRunnableMethod(
        this, &AppCacheURLRequestJobTest::MakeRangeRequest));
-    writer_.reset(service_->storage()->CreateResponseWriter(GURL()));
+    writer_.reset(service_->storage()->CreateResponseWriter(GURL(), 0));
     written_response_id_ = writer_->response_id();
     WriteBasicResponse();
     // Continues async
   }
 
   void MakeRangeRequest() {
     AppCacheStorage* storage = service_->storage();
     request_.reset(
         new net::URLRequest(GURL("http://blah/"), url_request_delegate_.get()));
 
     // Request a range, the 3 middle chars out of 'Hello'
     net::HttpRequestHeaders extra_headers;
     extra_headers.SetHeader("Range", "bytes= 1-3");
     request_->SetExtraRequestHeaders(extra_headers);
 
     // Create job with orders to deliver an appcached entry.
     scoped_refptr<AppCacheURLRequestJob> job(
         new AppCacheURLRequestJob(request_.get(), storage));
     job->DeliverAppCachedResponse(
-        GURL(), 111,
+        GURL(), 0, 111,
         AppCacheEntry(AppCacheEntry::EXPLICIT, written_response_id_),
         false);
     EXPECT_TRUE(job->is_delivering_appcache_response());
 
     // Start the request.
     EXPECT_FALSE(job->has_been_started());
     mock_factory_job_ = job;
     request_->Start();
     EXPECT_FALSE(mock_factory_job_);
     EXPECT_TRUE(job->has_been_started());
@@ skipping 25 matching lines @@
     // This test has several async steps.
     // 1. Write a large response to response storage.
     // 2. Use net::URLRequest to retrieve it.
     // 3. Cancel the request after data starts coming in.
 
     PushNextTask(NewRunnableMethod(
        this, &AppCacheURLRequestJobTest::VerifyCancel));
     PushNextTask(NewRunnableMethod(
        this, &AppCacheURLRequestJobTest::RequestAppCachedResource, true));
 
-    writer_.reset(service_->storage()->CreateResponseWriter(GURL()));
+    writer_.reset(service_->storage()->CreateResponseWriter(GURL(), 0));
     written_response_id_ = writer_->response_id();
     WriteLargeResponse();
 
     url_request_delegate_->kill_after_amount_received_ = kBlockSize;
     url_request_delegate_->kill_with_io_pending_ = false;
     // Continues async
   }
 
   void VerifyCancel() {
     EXPECT_EQ(net::URLRequestStatus::CANCELED,
               request_->status().status());
     TestFinished();
   }
 
   // CancelRequestWithIOPending --------------------------------------
 
   void CancelRequestWithIOPending() {
     // This test has several async steps.
     // 1. Write a large response to response storage.
     // 2. Use net::URLRequest to retrieve it.
     // 3. Cancel the request after data starts coming in.
 
     PushNextTask(NewRunnableMethod(
        this, &AppCacheURLRequestJobTest::VerifyCancel));
     PushNextTask(NewRunnableMethod(
        this, &AppCacheURLRequestJobTest::RequestAppCachedResource, true));
 
-    writer_.reset(service_->storage()->CreateResponseWriter(GURL()));
+    writer_.reset(service_->storage()->CreateResponseWriter(GURL(), 0));
     written_response_id_ = writer_->response_id();
     WriteLargeResponse();
 
     url_request_delegate_->kill_after_amount_received_ = kBlockSize;
     url_request_delegate_->kill_with_io_pending_ = true;
     // Continues async
   }
 
 
   // Data members --------------------------------------------------------
@@ skipping 70 matching lines @@
 
 TEST_F(AppCacheURLRequestJobTest, CancelRequestWithIOPending) {
   RunTestOnIOThread(&AppCacheURLRequestJobTest::CancelRequestWithIOPending);
 }
 
 }  // namespace appcache
 
 // AppCacheURLRequestJobTest is expected to always live longer than the
 // runnable methods.  This lets us call NewRunnableMethod on its instances.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(appcache::AppCacheURLRequestJobTest);