content/browser/service_worker/service_worker_job_unittest.cc - Issue 691413002: Removing redundant 'is_null' field in ServiceWorkerVersionInfo

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

Issue 691413002: Removing redundant 'is_null' field in ServiceWorkerVersionInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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_browsertest.cc ('K') | « content/browser/service_worker/service_worker_internals_ui.cc ('k') | content/browser/service_worker/service_worker_registration_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 91ad2263292d59ed1ee46083e7bedb3a8cc5195d..b90999e1019eea95eae1414e492b633170261402 100644

--- a/content/browser/service_worker/service_worker_job_unittest.cc

+++ b/content/browser/service_worker/service_worker_job_unittest.cc

@@ -1068,25 +1068,25 @@ TEST_F(ServiceWorkerJobTest, Update_NewVersion) {

EXPECT_TRUE(entry.mask.installing_changed());

EXPECT_FALSE(entry.mask.waiting_changed());

EXPECT_FALSE(entry.mask.active_changed());

- EXPECT_FALSE(entry.info.installing_version.is_null);

- EXPECT_TRUE(entry.info.waiting_version.is_null);

- EXPECT_FALSE(entry.info.active_version.is_null);

+ EXPECT_FALSE(entry.info.installing_version.version_id == kInvalidServiceWorkerVersionId);

nhiroki 2014/10/31 05:48:45 You might want to use EXPECT_EQ/EXPECT_NE here and

Paritosh Kumar 2014/10/31 06:53:19 Done.

+ EXPECT_TRUE(entry.info.waiting_version.version_id == kInvalidServiceWorkerVersionId);

+ EXPECT_FALSE(entry.info.active_version.version_id == kInvalidServiceWorkerVersionId);

entry = update_helper->attribute_change_log_[1];

EXPECT_TRUE(entry.mask.installing_changed());

EXPECT_TRUE(entry.mask.waiting_changed());

EXPECT_FALSE(entry.mask.active_changed());

- EXPECT_TRUE(entry.info.installing_version.is_null);

- EXPECT_FALSE(entry.info.waiting_version.is_null);

- EXPECT_FALSE(entry.info.active_version.is_null);

+ EXPECT_TRUE(entry.info.installing_version.version_id == kInvalidServiceWorkerVersionId);

+ EXPECT_FALSE(entry.info.waiting_version.version_id == kInvalidServiceWorkerVersionId);

+ EXPECT_FALSE(entry.info.active_version.version_id == kInvalidServiceWorkerVersionId);

entry = update_helper->attribute_change_log_[2];

EXPECT_FALSE(entry.mask.installing_changed());

EXPECT_TRUE(entry.mask.waiting_changed());

EXPECT_TRUE(entry.mask.active_changed());

- EXPECT_TRUE(entry.info.installing_version.is_null);

- EXPECT_TRUE(entry.info.waiting_version.is_null);

- EXPECT_FALSE(entry.info.active_version.is_null);

+ EXPECT_TRUE(entry.info.installing_version.version_id == kInvalidServiceWorkerVersionId);

+ EXPECT_TRUE(entry.info.waiting_version.version_id == kInvalidServiceWorkerVersionId);

+ EXPECT_FALSE(entry.info.active_version.version_id == kInvalidServiceWorkerVersionId);

// expected version state transitions:

// new.installing, new.installed,