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

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

Issue 377153003: Service Worker: set active worker to REDUNDANT when unregistered (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/service_worker/service_worker_register_job.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/files/scoped_temp_dir.h" 5 #include "base/files/scoped_temp_dir.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "content/browser/browser_thread_impl.h" 8 #include "content/browser/browser_thread_impl.h"
9 #include "content/browser/service_worker/embedded_worker_registry.h" 9 #include "content/browser/service_worker/embedded_worker_registry.h"
10 #include "content/browser/service_worker/embedded_worker_test_helper.h" 10 #include "content/browser/service_worker/embedded_worker_test_helper.h"
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 SaveFoundRegistration( 695 SaveFoundRegistration(
696 SERVICE_WORKER_ERROR_NOT_FOUND, &find_called, &registration)); 696 SERVICE_WORKER_ERROR_NOT_FOUND, &find_called, &registration));
697 697
698 base::RunLoop().RunUntilIdle(); 698 base::RunLoop().RunUntilIdle();
699 ASSERT_TRUE(find_called); 699 ASSERT_TRUE(find_called);
700 EXPECT_EQ(scoped_refptr<ServiceWorkerRegistration>(), registration); 700 EXPECT_EQ(scoped_refptr<ServiceWorkerRegistration>(), registration);
701 } 701 }
702 702
703 // Tests that the waiting worker enters the 'redundant' state upon 703 // Tests that the waiting worker enters the 'redundant' state upon
704 // unregistration. 704 // unregistration.
705 TEST_F(ServiceWorkerJobTest, UnregisterSetsRedundant) { 705 TEST_F(ServiceWorkerJobTest, UnregisterWaitingSetsRedundant) {
706 scoped_refptr<ServiceWorkerRegistration> registration; 706 scoped_refptr<ServiceWorkerRegistration> registration;
707 bool called = false; 707 bool called = false;
708 job_coordinator()->Register( 708 job_coordinator()->Register(
709 GURL("http://www.example.com/*"), 709 GURL("http://www.example.com/*"),
710 GURL("http://www.example.com/service_worker.js"), 710 GURL("http://www.example.com/service_worker.js"),
711 render_process_id_, 711 render_process_id_,
712 SaveRegistration(SERVICE_WORKER_OK, &called, &registration)); 712 SaveRegistration(SERVICE_WORKER_OK, &called, &registration));
713 base::RunLoop().RunUntilIdle(); 713 base::RunLoop().RunUntilIdle();
714 ASSERT_TRUE(called); 714 ASSERT_TRUE(called);
715 ASSERT_TRUE(registration); 715 ASSERT_TRUE(registration);
(...skipping 17 matching lines...) Expand all
733 job_coordinator()->Unregister(GURL("http://www.example.com/*"), 733 job_coordinator()->Unregister(GURL("http://www.example.com/*"),
734 SaveUnregistration(SERVICE_WORKER_OK, &called)); 734 SaveUnregistration(SERVICE_WORKER_OK, &called));
735 base::RunLoop().RunUntilIdle(); 735 base::RunLoop().RunUntilIdle();
736 ASSERT_TRUE(called); 736 ASSERT_TRUE(called);
737 737
738 EXPECT_EQ(ServiceWorkerVersion::RUNNING, 738 EXPECT_EQ(ServiceWorkerVersion::RUNNING,
739 version->running_status()); 739 version->running_status());
740 EXPECT_EQ(ServiceWorkerVersion::REDUNDANT, version->status()); 740 EXPECT_EQ(ServiceWorkerVersion::REDUNDANT, version->status());
741 } 741 }
742 742
743 // Tests that the active worker enters the 'redundant' state upon
744 // unregistration.
745 TEST_F(ServiceWorkerJobTest, UnregisterActiveSetsRedundant) {
746 scoped_refptr<ServiceWorkerRegistration> registration;
747 bool called = false;
748 job_coordinator()->Register(
749 GURL("http://www.example.com/*"),
750 GURL("http://www.example.com/service_worker.js"),
751 render_process_id_,
752 SaveRegistration(SERVICE_WORKER_OK, &called, &registration));
753 base::RunLoop().RunUntilIdle();
754 ASSERT_TRUE(called);
755 ASSERT_TRUE(registration);
756
757 scoped_refptr<ServiceWorkerVersion> version = registration->active_version();
758 EXPECT_EQ(ServiceWorkerVersion::RUNNING, version->running_status());
759 EXPECT_EQ(ServiceWorkerVersion::ACTIVATED, version->status());
760
761 called = false;
762 job_coordinator()->Unregister(GURL("http://www.example.com/*"),
763 SaveUnregistration(SERVICE_WORKER_OK, &called));
764 base::RunLoop().RunUntilIdle();
765 ASSERT_TRUE(called);
766
767 EXPECT_EQ(ServiceWorkerVersion::RUNNING, version->running_status());
768 EXPECT_EQ(ServiceWorkerVersion::REDUNDANT, version->status());
769 }
770
771 // Tests that the active worker enters the 'redundant' state upon
772 // unregistration.
773 TEST_F(ServiceWorkerJobTest,
774 UnregisterActiveSetsRedundant_WaitForNoControllee) {
775 scoped_refptr<ServiceWorkerRegistration> registration;
776 bool called = false;
777 job_coordinator()->Register(
778 GURL("http://www.example.com/*"),
779 GURL("http://www.example.com/service_worker.js"),
780 render_process_id_,
781 SaveRegistration(SERVICE_WORKER_OK, &called, &registration));
782 base::RunLoop().RunUntilIdle();
783 ASSERT_TRUE(called);
784 ASSERT_TRUE(registration);
785
786 scoped_ptr<ServiceWorkerProviderHost> host(
787 new ServiceWorkerProviderHost(33 /* dummy render process id */,
788 1 /* dummy provider_id */,
789 context()->AsWeakPtr(),
790 NULL));
791 registration->active_version()->AddControllee(host.get());
792
793 scoped_refptr<ServiceWorkerVersion> version = registration->active_version();
794 EXPECT_EQ(ServiceWorkerVersion::RUNNING, version->running_status());
795 EXPECT_EQ(ServiceWorkerVersion::ACTIVATED, version->status());
796
797 called = false;
798 job_coordinator()->Unregister(GURL("http://www.example.com/*"),
799 SaveUnregistration(SERVICE_WORKER_OK, &called));
800 base::RunLoop().RunUntilIdle();
801 ASSERT_TRUE(called);
802
803 EXPECT_EQ(ServiceWorkerVersion::RUNNING, version->running_status());
804 EXPECT_EQ(ServiceWorkerVersion::ACTIVATED, version->status());
805
806 registration->active_version()->RemoveControllee(host.get());
807 base::RunLoop().RunUntilIdle();
808 EXPECT_EQ(ServiceWorkerVersion::RUNNING, version->running_status());
809 EXPECT_EQ(ServiceWorkerVersion::REDUNDANT, version->status());
810 }
811
743 } // namespace content 812 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/service_worker/service_worker_register_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698