google_apis/gcm/gcm_client_impl_unittest.cc - Issue 288433002: G-services settings v3 implementation

Unified Diff: google_apis/gcm/gcm_client_impl_unittest.cc

Issue 288433002: G-services settings v3 implementation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressing feedback from Jian Li Created 6 years, 7 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

Index: google_apis/gcm/gcm_client_impl_unittest.cc

diff --git a/google_apis/gcm/gcm_client_impl_unittest.cc b/google_apis/gcm/gcm_client_impl_unittest.cc

index 010660a365e36081d3eca699788c3994a7cfd532..7c1d2e8e165a04866e6f471bc213260ef7095d34 100644

--- a/google_apis/gcm/gcm_client_impl_unittest.cc

+++ b/google_apis/gcm/gcm_client_impl_unittest.cc

@@ -42,7 +42,6 @@ enum LastEvent {

const uint64 kDeviceAndroidId = 54321;

const uint64 kDeviceSecurityToken = 12345;

const int64 kSettingsCheckinInterval = 16 * 60 * 60;

-const char kSettingsDefaultDigest[] = "default_digest";

const char kAppId[] = "app_id";

const char kSender[] = "project_id";

const char kSender2[] = "project_id2";

@@ -383,6 +382,7 @@ void GCMClientImplTest::CompleteCheckin(

response.set_security_token(security_token);

// For testing G-services settings.

+ bool diff = false;

if (!digest.empty()) {

response.set_digest(digest);

for (std::map<std::string, std::string>::const_iterator it =

@@ -392,7 +392,10 @@ void GCMClientImplTest::CompleteCheckin(

checkin_proto::GservicesSetting* setting = response.add_setting();

setting->set_name(it->first);

setting->set_value(it->second);

+ if (it->first.find("delete_") == 0)

+ diff = false;

jianli 2014/05/14 20:13:22 diff is never set to true?

fgorski 2014/05/14 20:44:34 Done. Testing of the settings_diff was moved to gs

}

+ response.set_settings_diff(diff);

}

std::string response_string;

@@ -690,8 +693,6 @@ class GCMClientImplCheckinTest : public GCMClientImplTest {

virtual ~GCMClientImplCheckinTest();

virtual void SetUp() OVERRIDE;

- std::map<std::string, std::string> GenerateSettings(int64 checkin_interval);

};

GCMClientImplCheckinTest::GCMClientImplCheckinTest() {

@@ -722,18 +723,20 @@ TEST_F(GCMClientImplCheckinTest, GServicesSettingsAfterInitialCheckin) {

settings["gcm_hostname"] = "alternative.gcm.host";

settings["gcm_secure_port"] = "7777";

settings["gcm_registration_url"] = "http://alternative.url/registration";

- CompleteCheckin(

- kDeviceAndroidId, kDeviceSecurityToken, kSettingsDefaultDigest, settings);

+ CompleteCheckin(kDeviceAndroidId,

+ kDeviceSecurityToken,

+ GServicesSettings::CalculateDigest(settings),

+ settings);

EXPECT_EQ(base::TimeDelta::FromSeconds(kSettingsCheckinInterval),

- gservices_settings().checkin_interval());

+ gservices_settings().GetCheckinInterval());

EXPECT_EQ(GURL("http://alternative.url/checkin"),

- gservices_settings().checkin_url());

+ gservices_settings().GetCheckinURL());

EXPECT_EQ(GURL("http://alternative.url/registration"),

- gservices_settings().registration_url());

+ gservices_settings().GetRegistrationURL());

EXPECT_EQ(GURL("https://alternative.gcm.host:7777"),

- gservices_settings().mcs_main_endpoint());

+ gservices_settings().GetMCSMainEndpoint());

EXPECT_EQ(GURL("https://alternative.gcm.host:443"),

- gservices_settings().mcs_fallback_endpoint());

+ gservices_settings().GetMCSFallbackEndpoint());

}

// This test only checks that periodic checkin happens.

@@ -744,13 +747,17 @@ TEST_F(GCMClientImplCheckinTest, PeriodicCheckin) {

settings["gcm_hostname"] = "alternative.gcm.host";

settings["gcm_secure_port"] = "7777";

settings["gcm_registration_url"] = "http://alternative.url/registration";

- CompleteCheckin(

- kDeviceAndroidId, kDeviceSecurityToken, kSettingsDefaultDigest, settings);

+ CompleteCheckin(kDeviceAndroidId,

+ kDeviceSecurityToken,

+ GServicesSettings::CalculateDigest(settings),

+ settings);

EXPECT_EQ(2, clock()->call_count());

PumpLoopUntilIdle();

- CompleteCheckin(

- kDeviceAndroidId, kDeviceSecurityToken, kSettingsDefaultDigest, settings);

+ CompleteCheckin(kDeviceAndroidId,

+ kDeviceSecurityToken,

+ GServicesSettings::CalculateDigest(settings),

+ settings);

}

TEST_F(GCMClientImplCheckinTest, LoadGSettingsFromStore) {

@@ -760,22 +767,24 @@ TEST_F(GCMClientImplCheckinTest, LoadGSettingsFromStore) {

settings["gcm_hostname"] = "alternative.gcm.host";

settings["gcm_secure_port"] = "7777";

settings["gcm_registration_url"] = "http://alternative.url/registration";

- CompleteCheckin(

- kDeviceAndroidId, kDeviceSecurityToken, kSettingsDefaultDigest, settings);

+ CompleteCheckin(kDeviceAndroidId,

+ kDeviceSecurityToken,

+ GServicesSettings::CalculateDigest(settings),

+ settings);

BuildGCMClient(base::TimeDelta());

InitializeGCMClient();

EXPECT_EQ(base::TimeDelta::FromSeconds(kSettingsCheckinInterval),

- gservices_settings().checkin_interval());

+ gservices_settings().GetCheckinInterval());

EXPECT_EQ(GURL("http://alternative.url/checkin"),

- gservices_settings().checkin_url());

+ gservices_settings().GetCheckinURL());

EXPECT_EQ(GURL("http://alternative.url/registration"),

- gservices_settings().registration_url());

+ gservices_settings().GetRegistrationURL());

EXPECT_EQ(GURL("https://alternative.gcm.host:7777"),

- gservices_settings().mcs_main_endpoint());

+ gservices_settings().GetMCSMainEndpoint());

EXPECT_EQ(GURL("https://alternative.gcm.host:443"),

- gservices_settings().mcs_fallback_endpoint());

+ gservices_settings().GetMCSFallbackEndpoint());

}

} // namespace gcm

« google_apis/gcm/engine/gservices_settings.cc ('K') | « google_apis/gcm/gcm_client_impl.cc ('k') | no next file » | no next file with comments »