Chromium Code Reviews| Index: google_apis/gcm/engine/gcm_store_impl_unittest.cc |
| diff --git a/google_apis/gcm/engine/gcm_store_impl_unittest.cc b/google_apis/gcm/engine/gcm_store_impl_unittest.cc |
| index 0656ad2fe6b0daded0c1c2c8915d39b916677594..c93a67f43cd01575eef82d8aef9a11fc37152c0b 100644 |
| --- a/google_apis/gcm/engine/gcm_store_impl_unittest.cc |
| +++ b/google_apis/gcm/engine/gcm_store_impl_unittest.cc |
| @@ -1,4 +1,4 @@ |
| -// Copyright 2014 The Chromium Authors. All rights reserved. |
| + // Copyright 2014 The Chromium Authors. All rights reserved. |
|
Nicolas Zea
2014/04/01 21:42:14
nit: remove leading space
fgorski
2014/04/02 18:23:00
Done.
|
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| @@ -108,6 +108,8 @@ TEST_F(GCMStoreImplTest, LoadNew) { |
| EXPECT_EQ(0U, load_result->device_security_token); |
| EXPECT_TRUE(load_result->incoming_messages.empty()); |
| EXPECT_TRUE(load_result->outgoing_messages.empty()); |
| + EXPECT_TRUE(load_result->gservices_settings.empty()); |
| + EXPECT_EQ(base::Time::FromInternalValue(0LL), load_result->last_checkin_time); |
| } |
| TEST_F(GCMStoreImplTest, DeviceCredentials) { |
| @@ -132,6 +134,60 @@ TEST_F(GCMStoreImplTest, DeviceCredentials) { |
| ASSERT_EQ(kDeviceToken, load_result->device_security_token); |
| } |
| +TEST_F(GCMStoreImplTest, GServicesSettings_ProtocolV2) { |
| + scoped_ptr<GCMStore> gcm_store(BuildGCMStore()); |
| + scoped_ptr<GCMStore::LoadResult> load_result; |
| + gcm_store->Load(base::Bind( |
| + &GCMStoreImplTest::LoadCallback, base::Unretained(this), &load_result)); |
| + PumpLoop(); |
| + |
| + std::map<std::string, std::string> settings; |
| + settings["checkin_interval"] = "12345"; |
| + settings["mcs_port"] = "438"; |
| + settings["checkin_url"] = "http://checkin.google.com"; |
| + std::string digest = "digest1"; |
| + base::Time last_checkin_time = base::Time::Now(); |
| + |
| + gcm_store->SetGServicesSettings( |
| + settings, |
| + digest, |
| + last_checkin_time, |
| + base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); |
| + PumpLoop(); |
| + |
| + gcm_store = BuildGCMStore().Pass(); |
| + gcm_store->Load(base::Bind( |
| + &GCMStoreImplTest::LoadCallback, base::Unretained(this), &load_result)); |
| + PumpLoop(); |
| + |
| + ASSERT_EQ(settings, load_result->gservices_settings); |
| + ASSERT_EQ(digest, load_result->gservices_digest); |
| + ASSERT_EQ(last_checkin_time, load_result->last_checkin_time); |
| + |
| + // Remove some, and add some. |
| + settings.clear(); |
| + settings["checkin_interval"] = "54321"; |
| + settings["registration_url"] = "http://registration.google.com"; |
| + digest = "digest2"; |
| + last_checkin_time = base::Time::Now(); |
| + |
| + gcm_store->SetGServicesSettings( |
| + settings, |
| + digest, |
| + last_checkin_time, |
| + base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); |
| + PumpLoop(); |
| + |
| + gcm_store = BuildGCMStore().Pass(); |
| + gcm_store->Load(base::Bind( |
| + &GCMStoreImplTest::LoadCallback, base::Unretained(this), &load_result)); |
| + PumpLoop(); |
| + |
| + ASSERT_EQ(settings, load_result->gservices_settings); |
| + ASSERT_EQ(digest, load_result->gservices_digest); |
| + ASSERT_EQ(last_checkin_time, load_result->last_checkin_time); |
| +} |
| + |
| TEST_F(GCMStoreImplTest, Registrations) { |
| scoped_ptr<GCMStore> gcm_store(BuildGCMStore()); |
| scoped_ptr<GCMStore::LoadResult> load_result; |