Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2179)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/service_worker/service_worker_storage_unittest.cc

Issue 1146913004: Service Worker: Add ServiceWorkerContainer.getRegistrations() method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use scoped_refptr to ServiceWorkerRegistration and rename variables. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« content/browser/service_worker/service_worker_dispatcher_host.cc ('K') | « content/browser/service_worker/service_worker_storage.cc ('k') | content/child/service_worker/service_worker_dispatcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/service_worker/service_worker_storage_unittest.cc
diff --git a/content/browser/service_worker/service_worker_storage_unittest.cc b/content/browser/service_worker/service_worker_storage_unittest.cc
index 8f9b7ceeb70963faf3d9dd414141dd3710d84308..e61ce156de7c2991a1efc745ffce6b7fa8a1caac 100644
--- a/content/browser/service_worker/service_worker_storage_unittest.cc
+++ b/content/browser/service_worker/service_worker_storage_unittest.cc
@@ -68,18 +68,34 @@ ServiceWorkerStorage::FindRegistrationCallback MakeFindCallback(
void GetAllCallback(
bool* was_called,
+ std::vector<scoped_refptr<ServiceWorkerRegistration>>* all_out,
+ const std::vector<scoped_refptr<ServiceWorkerRegistration>>& all) {
+ *was_called = true;
+ *all_out = all;
+}
+
+void GetAllInfosCallback(
+ bool* was_called,
std::vector<ServiceWorkerRegistrationInfo>* all_out,
const std::vector<ServiceWorkerRegistrationInfo>& all) {
*was_called = true;
*all_out = all;
}
-ServiceWorkerStorage::GetRegistrationsInfosCallback
-MakeGetRegistrationsCallback(bool* was_called,
- std::vector<ServiceWorkerRegistrationInfo>* all) {
+ServiceWorkerStorage::GetRegistrationsCallback MakeGetRegistrationsCallback(
+ bool* was_called,
+ std::vector<scoped_refptr<ServiceWorkerRegistration>>* all,
+ std::vector<std::vector<ResourceRecord>>* resource_lists) {
return base::Bind(&GetAllCallback, was_called, all);
}
+ServiceWorkerStorage::GetRegistrationsInfosCallback
+MakeGetRegistrationsInfosCallback(
+ bool* was_called,
+ std::vector<ServiceWorkerRegistrationInfo>* all) {
+ return base::Bind(&GetAllInfosCallback, was_called, all);
+}
+
void GetUserDataCallback(
bool* was_called,
std::string* data_out,
@@ -329,11 +345,11 @@ class ServiceWorkerStorageTest : public testing::Test {
return result;
}
- void GetAllRegistrations(
+ void GetAllRegistrationsInfos(
std::vector<ServiceWorkerRegistrationInfo>* registrations) {
bool was_called = false;
- storage()->GetAllRegistrations(
- MakeGetRegistrationsCallback(&was_called, registrations));
+ storage()->GetAllRegistrationsInfos(
+ MakeGetRegistrationsInfosCallback(&was_called, registrations));
EXPECT_FALSE(was_called); // always async
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(was_called);
@@ -341,11 +357,12 @@ class ServiceWorkerStorageTest : public testing::Test {
void GetRegistrationsForOrigin(
const GURL& origin,
- std::vector<ServiceWorkerRegistrationInfo>* registrations) {
+ std::vector<scoped_refptr<ServiceWorkerRegistration>>* registrations,
+ std::vector<std::vector<ResourceRecord>>* resource_lists) {
bool was_called = false;
storage()->GetRegistrationsForOrigin(
- origin,
- MakeGetRegistrationsCallback(&was_called, registrations));
+ origin, MakeGetRegistrationsCallback(&was_called, registrations,
+ resource_lists));
EXPECT_FALSE(was_called); // always async
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(was_called);
@@ -579,21 +596,22 @@ TEST_F(ServiceWorkerStorageTest, StoreFindUpdateDeleteRegistration) {
EXPECT_EQ(kResource1Size + kResource2Size,
found_registration->resources_total_size_bytes());
std::vector<ServiceWorkerRegistrationInfo> all_registrations;
- GetAllRegistrations(&all_registrations);
+ GetAllRegistrationsInfos(&all_registrations);
EXPECT_EQ(1u, all_registrations.size());
ServiceWorkerRegistrationInfo info = all_registrations[0];
EXPECT_EQ(kResource1Size + kResource2Size, info.stored_version_size_bytes);
all_registrations.clear();
// Finding by origin should provide the same result iif origin is kScope.
falken 2015/06/08 04:59:10 nit: not from this patch but s/iif/if
jungkees 2015/06/08 16:00:19 Fixed.
- std::vector<ServiceWorkerRegistrationInfo> registrations_origin;
- GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin);
+ std::vector<scoped_refptr<ServiceWorkerRegistration>> registrations_origin;
falken 2015/06/08 04:59:10 nit: also not from this patch but registrations_fo
jungkees 2015/06/08 16:00:19 Renamed all the occurrences.
falken 2015/06/08 16:14:58 Sorry, I didn't realize there were multiple occurr
+ std::vector<std::vector<ResourceRecord>> resource_lists;
+ GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin,
+ &resource_lists);
EXPECT_EQ(1u, registrations_origin.size());
registrations_origin.clear();
- GetRegistrationsForOrigin(
- GURL("http://example.com/").GetOrigin(),
- &registrations_origin);
+ GetRegistrationsForOrigin(GURL("http://example.com/").GetOrigin(),
+ &registrations_origin, &resource_lists);
EXPECT_TRUE(registrations_origin.empty());
found_registration = NULL;
@@ -685,7 +703,7 @@ TEST_F(ServiceWorkerStorageTest, InstallingRegistrationsAreFindable) {
live_version->SetStatus(ServiceWorkerVersion::INSTALLING);
live_registration->SetWaitingVersion(live_version);
- // Should not be findable, including by GetAllRegistrations.
+ // Should not be findable, including by GetAllRegistrationsInfos.
EXPECT_EQ(SERVICE_WORKER_ERROR_NOT_FOUND,
FindRegistrationForId(
kRegistrationId, kScope.GetOrigin(), &found_registration));
@@ -704,16 +722,17 @@ TEST_F(ServiceWorkerStorageTest, InstallingRegistrationsAreFindable) {
EXPECT_FALSE(found_registration.get());
std::vector<ServiceWorkerRegistrationInfo> all_registrations;
- GetAllRegistrations(&all_registrations);
+ GetAllRegistrationsInfos(&all_registrations);
EXPECT_TRUE(all_registrations.empty());
- std::vector<ServiceWorkerRegistrationInfo> registrations_origin;
- GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin);
+ std::vector<scoped_refptr<ServiceWorkerRegistration>> registrations_origin;
+ std::vector<std::vector<ResourceRecord>> resource_lists;
falken 2015/06/08 04:59:10 Do we ever test the value of this?
jungkees 2015/06/08 16:00:19 Thanks for spotting this. This value is not at all
falken 2015/06/08 16:14:58 I was hoping we could add tests for the new functi
jungkees 2015/06/08 16:27:17 That bit is done in the service_worker_database_un
falken 2015/06/09 07:37:50 Ah of course. Thanks!
+ GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin,
+ &resource_lists);
EXPECT_TRUE(registrations_origin.empty());
- GetRegistrationsForOrigin(
- GURL("http://example.com/").GetOrigin(),
- &registrations_origin);
+ GetRegistrationsForOrigin(GURL("http://example.com/").GetOrigin(),
+ &registrations_origin, &resource_lists);
EXPECT_TRUE(registrations_origin.empty());
// Notify storage of it being installed.
@@ -741,18 +760,18 @@ TEST_F(ServiceWorkerStorageTest, InstallingRegistrationsAreFindable) {
EXPECT_EQ(live_registration, found_registration);
found_registration = NULL;
- GetAllRegistrations(&all_registrations);
+ GetAllRegistrationsInfos(&all_registrations);
EXPECT_EQ(1u, all_registrations.size());
all_registrations.clear();
// Finding by origin should provide the same result iif origin is kScope.
- GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin);
+ GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin,
+ &resource_lists);
EXPECT_EQ(1u, registrations_origin.size());
registrations_origin.clear();
- GetRegistrationsForOrigin(
- GURL("http://example.com/").GetOrigin(),
- &registrations_origin);
+ GetRegistrationsForOrigin(GURL("http://example.com/").GetOrigin(),
+ &registrations_origin, &resource_lists);
EXPECT_TRUE(registrations_origin.empty());
// Notify storage of installation no longer happening.
@@ -777,15 +796,15 @@ TEST_F(ServiceWorkerStorageTest, InstallingRegistrationsAreFindable) {
FindRegistrationForPattern(kScope, &found_registration));
EXPECT_FALSE(found_registration.get());
- GetAllRegistrations(&all_registrations);
+ GetAllRegistrationsInfos(&all_registrations);
EXPECT_TRUE(all_registrations.empty());
- GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin);
+ GetRegistrationsForOrigin(kScope.GetOrigin(), &registrations_origin,
+ &resource_lists);
EXPECT_TRUE(registrations_origin.empty());
- GetRegistrationsForOrigin(
- GURL("http://example.com/").GetOrigin(),
- &registrations_origin);
+ GetRegistrationsForOrigin(GURL("http://example.com/").GetOrigin(),
+ &registrations_origin, &resource_lists);
EXPECT_TRUE(registrations_origin.empty());
}
« content/browser/service_worker/service_worker_dispatcher_host.cc ('K') | « content/browser/service_worker/service_worker_storage.cc ('k') | content/child/service_worker/service_worker_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698