Index: google_apis/gcm/engine/checkin_request_unittest.cc |
diff --git a/google_apis/gcm/engine/checkin_request_unittest.cc b/google_apis/gcm/engine/checkin_request_unittest.cc |
index 0142e0ca4f135b1ebf3f599d2f781c25953c1559..9ea6422a15e1b7ee378ba2967521ac4cba2a859d 100644 |
--- a/google_apis/gcm/engine/checkin_request_unittest.cc |
+++ b/google_apis/gcm/engine/checkin_request_unittest.cc |
@@ -65,7 +65,8 @@ class CheckinRequestTest : public testing::Test { |
CheckinRequestTest(); |
virtual ~CheckinRequestTest(); |
- void FetcherCallback(uint64 android_id, uint64 security_token); |
+ void FetcherCallback( |
+ const checkin_proto::AndroidCheckinResponse& response); |
void CreateRequest(uint64 android_id, uint64 security_token); |
@@ -102,11 +103,13 @@ CheckinRequestTest::CheckinRequestTest() |
CheckinRequestTest::~CheckinRequestTest() {} |
-void CheckinRequestTest::FetcherCallback(uint64 android_id, |
- uint64 security_token) { |
+void CheckinRequestTest::FetcherCallback( |
+ const checkin_proto::AndroidCheckinResponse& checkin_response) { |
callback_called_ = true; |
- android_id_ = android_id; |
- security_token_ = security_token; |
+ if (checkin_response.has_android_id()) |
+ android_id_ = checkin_response.android_id(); |
+ if (checkin_response.has_security_token()) |
+ security_token_ = checkin_response.security_token(); |
} |
void CheckinRequestTest::CreateRequest(uint64 android_id, |
@@ -166,6 +169,10 @@ void CheckinRequestTest::SetResponse(ResponseScenario response_scenario) { |
if (response_scenario != MISSING_SECURITY_TOKEN) |
response.set_security_token(security_token); |
+ checkin_proto::GservicesSetting* g_services_setting = response.add_setting(); |
+ g_services_setting->set_name("checkin_interval"); |
+ g_services_setting->set_value("3600"); |
+ |
std::string response_string; |
response.SerializeToString(&response_string); |
SetResponseStatusAndString(net::HTTP_OK, response_string); |
@@ -244,8 +251,8 @@ TEST_F(CheckinRequestTest, ResponseHttpStatusUnauthorized) { |
CompleteFetch(); |
EXPECT_TRUE(callback_called_); |
- EXPECT_EQ(0u, android_id_); |
- EXPECT_EQ(0u, security_token_); |
+ EXPECT_EQ(kBlankAndroidId, android_id_); |
+ EXPECT_EQ(kBlankSecurityToken, security_token_); |
} |
TEST_F(CheckinRequestTest, ResponseHttpStatusBadRequest) { |
@@ -256,8 +263,8 @@ TEST_F(CheckinRequestTest, ResponseHttpStatusBadRequest) { |
CompleteFetch(); |
EXPECT_TRUE(callback_called_); |
- EXPECT_EQ(0u, android_id_); |
- EXPECT_EQ(0u, security_token_); |
+ EXPECT_EQ(kBlankAndroidId, android_id_); |
+ EXPECT_EQ(kBlankSecurityToken, security_token_); |
} |
TEST_F(CheckinRequestTest, ResponseHttpStatusNotOK) { |