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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 140743012: Start EmbeddedWorker during registration - take 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Clean up log messages, tests Created 6 years, 11 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_unittest.cc ('K') | « content/browser/service_worker/service_worker_job_coordinator.cc ('k') | content/browser/service_worker/service_worker_register_job.h » ('j') | content/browser/service_worker/service_worker_register_job.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/service_worker/service_worker_job_unittest.cc
diff --git a/content/browser/service_worker/service_worker_job_unittest.cc b/content/browser/service_worker/service_worker_job_unittest.cc
index a458affba8bdeee2fbc49e1c0734e0fae6f9022c..213650bff85f9643471096e245ef97635ac9d8cd 100644
--- a/content/browser/service_worker/service_worker_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_job_unittest.cc
@@ -6,10 +6,14 @@
#include "base/logging.h"
#include "base/run_loop.h"
#include "content/browser/browser_thread_impl.h"
+#include "content/browser/service_worker/embedded_worker_registry.h"
+#include "content/browser/service_worker/embedded_worker_test_helper.h"
+#include "content/browser/service_worker/service_worker_context_core.h"
#include "content/browser/service_worker/service_worker_job_coordinator.h"
#include "content/browser/service_worker/service_worker_registration.h"
#include "content/browser/service_worker/service_worker_registration_status.h"
#include "content/public/test/test_browser_thread_bundle.h"
+#include "ipc/ipc_test_sink.h"
#include "testing/gtest/include/gtest/gtest.h"
// Unit tests for testing all job registration tasks.
@@ -91,16 +95,35 @@ class ServiceWorkerJobTest : public testing::Test {
: browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {}
virtual void SetUp() OVERRIDE {
- storage_.reset(new ServiceWorkerStorage(base::FilePath(), NULL));
- job_coordinator_.reset(new ServiceWorkerJobCoordinator(storage_.get()));
+ context_.reset(new ServiceWorkerContextCore(base::FilePath(), NULL));
+ helper_.reset(new EmbeddedWorkerTestHelper(context_.get()));
+
+ storage_ = context_->storage();
+ job_coordinator_ = context_->job_coordinator();
+
+ scoped_ptr<EmbeddedWorkerInstance> worker =
+ context_->embedded_worker_registry()->CreateWorker();
+
+ render_process_id_ = 88;
+ int embedded_worker_id = worker->embedded_worker_id();
+ helper_->SimulateAddProcess(embedded_worker_id, render_process_id_);
}
- virtual void TearDown() OVERRIDE { storage_.reset(); }
+ virtual void TearDown() OVERRIDE {
+ helper_.reset();
+ context_.reset();
+ }
protected:
TestBrowserThreadBundle browser_thread_bundle_;
- scoped_ptr<ServiceWorkerStorage> storage_;
- scoped_ptr<ServiceWorkerJobCoordinator> job_coordinator_;
+ scoped_ptr<ServiceWorkerContextCore> context_;
+ scoped_ptr<EmbeddedWorkerTestHelper> helper_;
+
+ // these are just shortcuts into context_ above
+ ServiceWorkerStorage* storage_;
+ ServiceWorkerJobCoordinator* job_coordinator_;
kinuko 2014/02/04 03:37:53 nit: could we instead have accessors like storage(
alecflett 2014/02/04 20:09:04 Done.
+
+ int render_process_id_;
kinuko 2014/02/04 03:37:53 Please initialize this in ctor (with -1 etc)
alecflett 2014/02/04 20:09:04 Done.
};
TEST_F(ServiceWorkerJobTest, SameDocumentSameRegistration) {
@@ -109,6 +132,7 @@ TEST_F(ServiceWorkerJobTest, SameDocumentSameRegistration) {
job_coordinator_->Register(
GURL("http://www.example.com/*"),
GURL("http://www.example.com/service_worker.js"),
+ render_process_id_,
SaveRegistration(SERVICE_WORKER_OK, &called, &original_registration));
EXPECT_FALSE(called);
base::RunLoop().RunUntilIdle();
@@ -141,6 +165,7 @@ TEST_F(ServiceWorkerJobTest, SameMatchSameRegistration) {
job_coordinator_->Register(
GURL("http://www.example.com/*"),
GURL("http://www.example.com/service_worker.js"),
+ render_process_id_,
SaveRegistration(SERVICE_WORKER_OK, &called, &original_registration));
EXPECT_FALSE(called);
base::RunLoop().RunUntilIdle();
@@ -174,6 +199,7 @@ TEST_F(ServiceWorkerJobTest, DifferentMatchDifferentRegistration) {
job_coordinator_->Register(
GURL("http://www.example.com/one/*"),
GURL("http://www.example.com/service_worker.js"),
+ render_process_id_,
SaveRegistration(SERVICE_WORKER_OK, &called1, &original_registration1));
bool called2;
@@ -181,6 +207,7 @@ TEST_F(ServiceWorkerJobTest, DifferentMatchDifferentRegistration) {
job_coordinator_->Register(
GURL("http://www.example.com/two/*"),
GURL("http://www.example.com/service_worker.js"),
+ render_process_id_,
SaveRegistration(SERVICE_WORKER_OK, &called2, &original_registration2));
EXPECT_FALSE(called1);
@@ -214,6 +241,7 @@ TEST_F(ServiceWorkerJobTest, Register) {
job_coordinator_->Register(
GURL("http://www.example.com/*"),
GURL("http://www.example.com/service_worker.js"),
+ render_process_id_,
SaveRegistration(SERVICE_WORKER_OK, &called, &registration));
ASSERT_FALSE(called);
@@ -232,6 +260,7 @@ TEST_F(ServiceWorkerJobTest, Unregister) {
job_coordinator_->Register(
pattern,
GURL("http://www.example.com/service_worker.js"),
+ render_process_id_,
SaveRegistration(SERVICE_WORKER_OK, &called, &registration));
ASSERT_FALSE(called);
@@ -239,6 +268,7 @@ TEST_F(ServiceWorkerJobTest, Unregister) {
ASSERT_TRUE(called);
job_coordinator_->Unregister(pattern,
+ render_process_id_,
SaveUnregistration(SERVICE_WORKER_OK, &called));
ASSERT_FALSE(called);
@@ -268,6 +298,7 @@ TEST_F(ServiceWorkerJobTest, RegisterNewScript) {
job_coordinator_->Register(
pattern,
GURL("http://www.example.com/service_worker.js"),
+ render_process_id_,
SaveRegistration(SERVICE_WORKER_OK, &called, &old_registration));
ASSERT_FALSE(called);
@@ -291,6 +322,7 @@ TEST_F(ServiceWorkerJobTest, RegisterNewScript) {
job_coordinator_->Register(
pattern,
GURL("http://www.example.com/service_worker_new.js"),
+ render_process_id_,
SaveRegistration(SERVICE_WORKER_OK, &called, &new_registration));
ASSERT_FALSE(called);
@@ -325,6 +357,7 @@ TEST_F(ServiceWorkerJobTest, RegisterDuplicateScript) {
job_coordinator_->Register(
pattern,
script_url,
+ render_process_id_,
SaveRegistration(SERVICE_WORKER_OK, &called, &old_registration));
ASSERT_FALSE(called);
@@ -346,6 +379,7 @@ TEST_F(ServiceWorkerJobTest, RegisterDuplicateScript) {
job_coordinator_->Register(
pattern,
script_url,
+ render_process_id_,
SaveRegistration(SERVICE_WORKER_OK, &called, &new_registration));
ASSERT_FALSE(called);
@@ -380,11 +414,14 @@ TEST_F(ServiceWorkerJobTest, ParallelRegUnreg) {
job_coordinator_->Register(
pattern,
script_url,
+ render_process_id_,
SaveRegistration(SERVICE_WORKER_OK, &registration_called, &registration));
bool unregistration_called = false;
job_coordinator_->Unregister(
- pattern, SaveUnregistration(SERVICE_WORKER_OK, &unregistration_called));
+ pattern,
+ render_process_id_,
+ SaveUnregistration(SERVICE_WORKER_OK, &unregistration_called));
ASSERT_FALSE(registration_called);
ASSERT_FALSE(unregistration_called);
@@ -417,8 +454,9 @@ TEST_F(ServiceWorkerJobTest, ParallelRegNewScript) {
job_coordinator_->Register(
pattern,
script_url1,
- SaveRegistration(SERVICE_WORKER_OK, &registration1_called,
- &registration1));
+ render_process_id_,
+ SaveRegistration(
+ SERVICE_WORKER_OK, &registration1_called, &registration1));
GURL script_url2("http://www.example.com/service_worker2.js");
bool registration2_called = false;
@@ -426,8 +464,9 @@ TEST_F(ServiceWorkerJobTest, ParallelRegNewScript) {
job_coordinator_->Register(
pattern,
script_url2,
- SaveRegistration(SERVICE_WORKER_OK, &registration2_called,
- &registration2));
+ render_process_id_,
+ SaveRegistration(
+ SERVICE_WORKER_OK, &registration2_called, &registration2));
ASSERT_FALSE(registration1_called);
ASSERT_FALSE(registration2_called);
@@ -461,16 +500,18 @@ TEST_F(ServiceWorkerJobTest, ParallelRegSameScript) {
job_coordinator_->Register(
pattern,
script_url,
- SaveRegistration(SERVICE_WORKER_OK, &registration1_called,
- &registration1));
+ render_process_id_,
+ SaveRegistration(
+ SERVICE_WORKER_OK, &registration1_called, &registration1));
bool registration2_called = false;
scoped_refptr<ServiceWorkerRegistration> registration2;
job_coordinator_->Register(
pattern,
script_url,
- SaveRegistration(SERVICE_WORKER_OK, &registration2_called,
- &registration2));
+ render_process_id_,
+ SaveRegistration(
+ SERVICE_WORKER_OK, &registration2_called, &registration2));
ASSERT_FALSE(registration1_called);
ASSERT_FALSE(registration2_called);
@@ -498,11 +539,15 @@ TEST_F(ServiceWorkerJobTest, ParallelUnreg) {
GURL script_url("http://www.example.com/service_worker.js");
bool unregistration1_called = false;
job_coordinator_->Unregister(
- pattern, SaveUnregistration(SERVICE_WORKER_OK, &unregistration1_called));
+ pattern,
+ render_process_id_,
+ SaveUnregistration(SERVICE_WORKER_OK, &unregistration1_called));
bool unregistration2_called = false;
job_coordinator_->Unregister(
- pattern, SaveUnregistration(SERVICE_WORKER_OK, &unregistration2_called));
+ pattern,
+ render_process_id_,
+ SaveUnregistration(SERVICE_WORKER_OK, &unregistration2_called));
ASSERT_FALSE(unregistration1_called);
ASSERT_FALSE(unregistration2_called);
« content/browser/service_worker/service_worker_dispatcher_host_unittest.cc ('K') | « content/browser/service_worker/service_worker_job_coordinator.cc ('k') | content/browser/service_worker/service_worker_register_job.h » ('j') | content/browser/service_worker/service_worker_register_job.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698