OLD | NEW |
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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) { | 89 TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) { |
90 const GURL kScope("http://www.example.not/"); | 90 const GURL kScope("http://www.example.not/"); |
91 const GURL kScript("http://www.example.not/service_worker.js"); | 91 const GURL kScript("http://www.example.not/service_worker.js"); |
92 int64 kRegistrationId = 1L; | 92 int64 kRegistrationId = 1L; |
93 scoped_refptr<ServiceWorkerRegistration> registration = | 93 scoped_refptr<ServiceWorkerRegistration> registration = |
94 new ServiceWorkerRegistration( | 94 new ServiceWorkerRegistration( |
95 kScope, | 95 kScope, |
96 kRegistrationId, | 96 kRegistrationId, |
97 context_ptr_); | 97 context_ptr_); |
98 | 98 |
99 const int64 version_1_id = 1L; | 99 const std::string version_1_id("153963e6-6f53-46ca-b6d4-b8e6a6158c06"); |
100 const int64 version_2_id = 2L; | 100 const std::string version_2_id("93943e79-0510-47ab-ad36-f1cc93a1dfab"); |
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); | 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_uuid); |
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_TRUE(listener.observed_info_.installing_version.version_uuid.empty()); |
118 kInvalidServiceWorkerVersionId); | 118 EXPECT_TRUE(listener.observed_info_.waiting_version.version_uuid.empty()); |
119 EXPECT_EQ(listener.observed_info_.waiting_version.version_id, | |
120 kInvalidServiceWorkerVersionId); | |
121 listener.Reset(); | 119 listener.Reset(); |
122 | 120 |
123 registration->SetInstallingVersion(version_2); | 121 registration->SetInstallingVersion(version_2); |
124 | 122 |
125 EXPECT_EQ(version_2.get(), registration->installing_version()); | 123 EXPECT_EQ(version_2.get(), registration->installing_version()); |
126 EXPECT_EQ(ChangedVersionAttributesMask::INSTALLING_VERSION, | 124 EXPECT_EQ(ChangedVersionAttributesMask::INSTALLING_VERSION, |
127 listener.observed_changed_mask_.changed()); | 125 listener.observed_changed_mask_.changed()); |
128 EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id); | 126 EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_uuid); |
129 EXPECT_EQ(version_2_id, | 127 EXPECT_EQ(version_2_id, |
130 listener.observed_info_.installing_version.version_id); | 128 listener.observed_info_.installing_version.version_uuid); |
131 EXPECT_EQ(listener.observed_info_.waiting_version.version_id, | 129 EXPECT_TRUE(listener.observed_info_.waiting_version.version_uuid.empty()); |
132 kInvalidServiceWorkerVersionId); | |
133 listener.Reset(); | 130 listener.Reset(); |
134 | 131 |
135 registration->SetWaitingVersion(version_2); | 132 registration->SetWaitingVersion(version_2); |
136 | 133 |
137 EXPECT_EQ(version_2.get(), registration->waiting_version()); | 134 EXPECT_EQ(version_2.get(), registration->waiting_version()); |
138 EXPECT_FALSE(registration->installing_version()); | 135 EXPECT_FALSE(registration->installing_version()); |
139 EXPECT_TRUE(listener.observed_changed_mask_.waiting_changed()); | 136 EXPECT_TRUE(listener.observed_changed_mask_.waiting_changed()); |
140 EXPECT_TRUE(listener.observed_changed_mask_.installing_changed()); | 137 EXPECT_TRUE(listener.observed_changed_mask_.installing_changed()); |
141 EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id); | 138 EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_uuid); |
142 EXPECT_EQ(version_2_id, listener.observed_info_.waiting_version.version_id); | 139 EXPECT_EQ(version_2_id, listener.observed_info_.waiting_version.version_uuid); |
143 EXPECT_EQ(listener.observed_info_.installing_version.version_id, | 140 EXPECT_TRUE(listener.observed_info_.installing_version.version_uuid.empty()); |
144 kInvalidServiceWorkerVersionId); | |
145 listener.Reset(); | 141 listener.Reset(); |
146 | 142 |
147 registration->UnsetVersion(version_2.get()); | 143 registration->UnsetVersion(version_2.get()); |
148 | 144 |
149 EXPECT_FALSE(registration->waiting_version()); | 145 EXPECT_FALSE(registration->waiting_version()); |
150 EXPECT_EQ(ChangedVersionAttributesMask::WAITING_VERSION, | 146 EXPECT_EQ(ChangedVersionAttributesMask::WAITING_VERSION, |
151 listener.observed_changed_mask_.changed()); | 147 listener.observed_changed_mask_.changed()); |
152 EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id); | 148 EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_uuid); |
153 EXPECT_EQ(listener.observed_info_.waiting_version.version_id, | 149 EXPECT_TRUE(listener.observed_info_.waiting_version.version_uuid.empty()); |
154 kInvalidServiceWorkerVersionId); | 150 EXPECT_TRUE(listener.observed_info_.installing_version.version_uuid.empty()); |
155 EXPECT_EQ(listener.observed_info_.installing_version.version_id, | |
156 kInvalidServiceWorkerVersionId); | |
157 } | 151 } |
158 | 152 |
159 TEST_F(ServiceWorkerRegistrationTest, FailedRegistrationNoCrash) { | 153 TEST_F(ServiceWorkerRegistrationTest, FailedRegistrationNoCrash) { |
160 const GURL kScope("http://www.example.not/"); | 154 const GURL kScope("http://www.example.not/"); |
161 int64 kRegistrationId = 1L; | 155 int64 kRegistrationId = 1L; |
162 scoped_refptr<ServiceWorkerRegistration> registration = | 156 scoped_refptr<ServiceWorkerRegistration> registration = |
163 new ServiceWorkerRegistration( | 157 new ServiceWorkerRegistration( |
164 kScope, | 158 kScope, |
165 kRegistrationId, | 159 kRegistrationId, |
166 context_ptr_); | 160 context_ptr_); |
167 scoped_ptr<ServiceWorkerRegistrationHandle> handle( | 161 scoped_ptr<ServiceWorkerRegistrationHandle> handle( |
168 new ServiceWorkerRegistrationHandle( | 162 new ServiceWorkerRegistrationHandle( |
169 context_ptr_, | 163 context_ptr_, |
170 base::WeakPtr<ServiceWorkerProviderHost>(), | 164 base::WeakPtr<ServiceWorkerProviderHost>(), |
171 registration.get())); | 165 registration.get())); |
172 registration->NotifyRegistrationFailed(); | 166 registration->NotifyRegistrationFailed(); |
173 // Don't crash when handle gets destructed. | 167 // Don't crash when handle gets destructed. |
174 } | 168 } |
175 | 169 |
176 } // namespace content | 170 } // namespace content |
OLD | NEW |