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

Side by Side Diff: content/browser/service_worker/service_worker_registration_unittest.cc

Issue 1106723002: ServiceWorker: Decompose SWRegistration::SetVersionInternal for readability (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make the argument const-ref Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/service_worker/service_worker_registration.h" 5 #include "content/browser/service_worker/service_worker_registration.h"
6 6
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 const int64 version_1_id = 1L; 99 const int64 version_1_id = 1L;
100 const int64 version_2_id = 2L; 100 const int64 version_2_id = 2L;
101 scoped_refptr<ServiceWorkerVersion> version_1 = new ServiceWorkerVersion( 101 scoped_refptr<ServiceWorkerVersion> version_1 = new ServiceWorkerVersion(
102 registration.get(), kScript, version_1_id, context_ptr_); 102 registration.get(), kScript, version_1_id, context_ptr_);
103 scoped_refptr<ServiceWorkerVersion> version_2 = new ServiceWorkerVersion( 103 scoped_refptr<ServiceWorkerVersion> version_2 = new ServiceWorkerVersion(
104 registration.get(), kScript, version_2_id, context_ptr_); 104 registration.get(), kScript, version_2_id, context_ptr_);
105 105
106 RegistrationListener listener; 106 RegistrationListener listener;
107 registration->AddListener(&listener); 107 registration->AddListener(&listener);
108 registration->SetActiveVersion(version_1.get()); 108 registration->SetActiveVersion(version_1);
109 109
110 EXPECT_EQ(version_1.get(), registration->active_version()); 110 EXPECT_EQ(version_1.get(), registration->active_version());
111 EXPECT_EQ(registration, listener.observed_registration_); 111 EXPECT_EQ(registration, listener.observed_registration_);
112 EXPECT_EQ(ChangedVersionAttributesMask::ACTIVE_VERSION, 112 EXPECT_EQ(ChangedVersionAttributesMask::ACTIVE_VERSION,
113 listener.observed_changed_mask_.changed()); 113 listener.observed_changed_mask_.changed());
114 EXPECT_EQ(kScope, listener.observed_info_.pattern); 114 EXPECT_EQ(kScope, listener.observed_info_.pattern);
115 EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id); 115 EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id);
116 EXPECT_EQ(kScript, listener.observed_info_.active_version.script_url); 116 EXPECT_EQ(kScript, listener.observed_info_.active_version.script_url);
117 EXPECT_EQ(listener.observed_info_.installing_version.version_id, 117 EXPECT_EQ(listener.observed_info_.installing_version.version_id,
118 kInvalidServiceWorkerVersionId); 118 kInvalidServiceWorkerVersionId);
119 EXPECT_EQ(listener.observed_info_.waiting_version.version_id, 119 EXPECT_EQ(listener.observed_info_.waiting_version.version_id,
120 kInvalidServiceWorkerVersionId); 120 kInvalidServiceWorkerVersionId);
121 listener.Reset(); 121 listener.Reset();
122 122
123 registration->SetInstallingVersion(version_2.get()); 123 registration->SetInstallingVersion(version_2);
124 124
125 EXPECT_EQ(version_2.get(), registration->installing_version()); 125 EXPECT_EQ(version_2.get(), registration->installing_version());
126 EXPECT_EQ(ChangedVersionAttributesMask::INSTALLING_VERSION, 126 EXPECT_EQ(ChangedVersionAttributesMask::INSTALLING_VERSION,
127 listener.observed_changed_mask_.changed()); 127 listener.observed_changed_mask_.changed());
128 EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id); 128 EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id);
129 EXPECT_EQ(version_2_id, 129 EXPECT_EQ(version_2_id,
130 listener.observed_info_.installing_version.version_id); 130 listener.observed_info_.installing_version.version_id);
131 EXPECT_EQ(listener.observed_info_.waiting_version.version_id, 131 EXPECT_EQ(listener.observed_info_.waiting_version.version_id,
132 kInvalidServiceWorkerVersionId); 132 kInvalidServiceWorkerVersionId);
133 listener.Reset(); 133 listener.Reset();
134 134
135 registration->SetWaitingVersion(version_2.get()); 135 registration->SetWaitingVersion(version_2);
136 136
137 EXPECT_EQ(version_2.get(), registration->waiting_version()); 137 EXPECT_EQ(version_2.get(), registration->waiting_version());
138 EXPECT_FALSE(registration->installing_version()); 138 EXPECT_FALSE(registration->installing_version());
139 EXPECT_TRUE(listener.observed_changed_mask_.waiting_changed()); 139 EXPECT_TRUE(listener.observed_changed_mask_.waiting_changed());
140 EXPECT_TRUE(listener.observed_changed_mask_.installing_changed()); 140 EXPECT_TRUE(listener.observed_changed_mask_.installing_changed());
141 EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id); 141 EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id);
142 EXPECT_EQ(version_2_id, listener.observed_info_.waiting_version.version_id); 142 EXPECT_EQ(version_2_id, listener.observed_info_.waiting_version.version_id);
143 EXPECT_EQ(listener.observed_info_.installing_version.version_id, 143 EXPECT_EQ(listener.observed_info_.installing_version.version_id,
144 kInvalidServiceWorkerVersionId); 144 kInvalidServiceWorkerVersionId);
145 listener.Reset(); 145 listener.Reset();
(...skipping 21 matching lines...) Expand all
167 scoped_ptr<ServiceWorkerRegistrationHandle> handle( 167 scoped_ptr<ServiceWorkerRegistrationHandle> handle(
168 new ServiceWorkerRegistrationHandle( 168 new ServiceWorkerRegistrationHandle(
169 context_ptr_, 169 context_ptr_,
170 base::WeakPtr<ServiceWorkerProviderHost>(), 170 base::WeakPtr<ServiceWorkerProviderHost>(),
171 registration.get())); 171 registration.get()));
172 registration->NotifyRegistrationFailed(); 172 registration->NotifyRegistrationFailed();
173 // Don't crash when handle gets destructed. 173 // Don't crash when handle gets destructed.
174 } 174 }
175 175
176 } // namespace content 176 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698