Index: content/browser/background_fetch/background_fetch_data_manager_unittest.cc |
diff --git a/content/browser/background_fetch/background_fetch_data_manager_unittest.cc b/content/browser/background_fetch/background_fetch_data_manager_unittest.cc |
index 64c31f1982c33cf991e6b6fe5400467bdd72f1c0..f9efa4f4977aef23b2e2acbb2af6b9206ed1f300 100644 |
--- a/content/browser/background_fetch/background_fetch_data_manager_unittest.cc |
+++ b/content/browser/background_fetch/background_fetch_data_manager_unittest.cc |
@@ -6,6 +6,7 @@ |
#include "base/files/file_path.h" |
#include "content/browser/background_fetch/background_fetch_context.h" |
+#include "content/browser/background_fetch/batch_request.h" |
#include "content/browser/background_fetch/fetch_request.h" |
#include "content/browser/service_worker/embedded_worker_test_helper.h" |
#include "content/browser/service_worker/service_worker_context_wrapper.h" |
@@ -28,9 +29,10 @@ class BackgroundFetchDataManagerTest : public testing::Test { |
protected: |
BackgroundFetchDataManagerTest() |
: helper_(base::FilePath()), |
- background_fetch_context_( |
- new BackgroundFetchContext(&browser_context_, |
- helper_.context_wrapper())) {} |
+ background_fetch_context_(new BackgroundFetchContext( |
+ &browser_context_, |
+ BrowserContext::GetDefaultStoragePartition(&browser_context_), |
+ helper_.context_wrapper())) {} |
BackgroundFetchDataManager* GetDataManager() const { |
return background_fetch_context_->GetDataManagerForTesting(); |
@@ -45,14 +47,43 @@ class BackgroundFetchDataManagerTest : public testing::Test { |
}; |
TEST_F(BackgroundFetchDataManagerTest, AddRequest) { |
+ // Create a BatchRequest and a set of FetchRequests. |
+ std::vector<FetchRequest> fetch_requests; |
+ std::vector<std::string> fetch_guids; |
+ for (int i = 0; i < 10; i++) { |
+ FetchRequest fetch_request(GURL(kResource), kTag); |
+ fetch_guids.push_back(fetch_request.guid()); |
+ fetch_requests.push_back(std::move(fetch_request)); |
+ } |
+ BatchRequest batch_request(kTag, url::Origin(GURL(kOrigin)), |
+ kServiceWorkerRegistrationId); |
+ |
+ // Initialize a BatchData with the constructed requests. |
BackgroundFetchDataManager* data_manager = GetDataManager(); |
- FetchRequest request(url::Origin(GURL(kOrigin)), GURL(kResource), |
- kServiceWorkerRegistrationId, kTag); |
+ BackgroundFetchDataManager::BatchData* batch_data = |
+ data_manager->CreateRequest(batch_request, fetch_requests); |
+ |
+ // Get all of the fetch requests from the BatchData. |
+ for (int i = 0; i < 10; i++) { |
+ EXPECT_FALSE(batch_data->IsComplete()); |
+ ASSERT_TRUE(batch_data->HasRequestsRemaining()); |
+ const FetchRequest& fetch_request = batch_data->GetNextFetchRequest(); |
+ EXPECT_EQ(fetch_request.tag(), kTag); |
+ } |
+ |
+ // At this point, all the fetches have been started, but none finished. |
+ EXPECT_FALSE(batch_data->HasRequestsRemaining()); |
+ EXPECT_FALSE(batch_data->IsComplete()); |
- data_manager->CreateRequest(request); |
+ // Complete all buy one of the fetch requests. |
+ for (int i = 0; i < 9; i++) { |
+ EXPECT_FALSE(batch_data->FetchRequestComplete(fetch_guids[i])); |
+ EXPECT_FALSE(batch_data->IsComplete()); |
+ } |
- // TODO(harkness) There's no output to test yet. Once there is, check that the |
- // request was actually added. |
+ // Complete the final fetch request. |
+ EXPECT_FALSE(batch_data->FetchRequestComplete(fetch_guids[9])); |
+ EXPECT_TRUE(batch_data->IsComplete()); |
} |
} // namespace content |