[GCM] Add TTL support

google_apis/gcm/engine/mcs_client_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "google_apis/gcm/engine/mcs_client.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/test/simple_test_clock.h"
 #include "components/webdata/encryptor/encryptor.h"
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/engine/fake_connection_factory.h"
 #include "google_apis/gcm/engine/fake_connection_handler.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 
 namespace {
 
 const uint64 kAndroidId = 54321;
 const uint64 kSecurityToken = 12345;
 
 // Number of messages to send when testing batching.
 // Note: must be even for tests that split batches in half.
 const int kMessageBatchSize = 6;
 
 // The number of unacked messages the client will receive before sending a
 // stream ack.
 // TODO(zea): get this (and other constants) directly from the mcs client.
 const int kAckLimitSize = 10;
 
+// TTL value for reliable messages.
+const int kTTLValue = 5 * 60;  // 5 minutes.
+
 // Helper for building arbitrary data messages.
 MCSMessage BuildDataMessage(const std::string& from,
                             const std::string& category,
                             int last_stream_id_received,
-                            const std::string persistent_id) {
+                            const std::string persistent_id,
+                            int ttl,
+                            uint64 sent) {
   mcs_proto::DataMessageStanza data_message;
   data_message.set_from(from);
   data_message.set_category(category);
   data_message.set_last_stream_id_received(last_stream_id_received);
   if (!persistent_id.empty())
     data_message.set_persistent_id(persistent_id);
+  data_message.set_ttl(ttl);
+  data_message.set_sent(sent);
   return MCSMessage(kDataMessageStanzaTag, data_message);
 }
 
 // MCSClient with overriden exposed persistent id logic.
 class TestMCSClient : public MCSClient {
  public:
-  TestMCSClient(ConnectionFactory* connection_factory,
+  TestMCSClient(base::Clock* clock,
+                ConnectionFactory* connection_factory,
                 RMQStore* rmq_store)
-    : MCSClient(connection_factory, rmq_store),
+    : MCSClient(clock, connection_factory, rmq_store),
       next_id_(0) {
   }
 
   virtual std::string GetNextPersistentId() OVERRIDE {
     return base::UintToString(++next_id_);
   }
 
  private:
   uint32 next_id_;
 };
 
 class MCSClientTest : public testing::Test {
  public:
   MCSClientTest();
   virtual ~MCSClientTest();
 
   void BuildMCSClient();
   void InitializeClient();
   void LoginClient(const std::vector<std::string>& acknowledged_ids);
 
+  base::SimpleTestClock* clock() { return &clock_; }
   TestMCSClient* mcs_client() const { return mcs_client_.get(); }
   FakeConnectionFactory* connection_factory() {
     return &connection_factory_;
   }
   bool init_success() const { return init_success_; }
   uint64 restored_android_id() const { return restored_android_id_; }
   uint64 restored_security_token() const { return restored_security_token_; }
   MCSMessage* received_message() const { return received_message_.get(); }
   std::string sent_message_id() const { return sent_message_id_;}
 
   FakeConnectionHandler* GetFakeHandler() const;
 
   void WaitForMCSEvent();
   void PumpLoop();
 
  private:
   void InitializationCallback(bool success,
                               uint64 restored_android_id,
                               uint64 restored_security_token);
   void MessageReceivedCallback(const MCSMessage& message);
   void MessageSentCallback(const std::string& message_id);
 
+  base::SimpleTestClock clock_;
+
   base::ScopedTempDir temp_directory_;
   base::MessageLoop message_loop_;
   scoped_ptr<base::RunLoop> run_loop_;
   scoped_ptr<RMQStore> rmq_store_;
 
   FakeConnectionFactory connection_factory_;
   scoped_ptr<TestMCSClient> mcs_client_;
   bool init_success_;
   uint64 restored_android_id_;
   uint64 restored_security_token_;
@@ skipping 13 matching lines @@
 #if defined(OS_MACOSX)
     Encryptor::UseMockKeychain(true);
 #endif
 }
 
 MCSClientTest::~MCSClientTest() {}
 
 void MCSClientTest::BuildMCSClient() {
   rmq_store_.reset(new RMQStore(temp_directory_.path(),
                                 message_loop_.message_loop_proxy()));
-  mcs_client_.reset(new TestMCSClient(&connection_factory_, rmq_store_.get()));
+  mcs_client_.reset(new TestMCSClient(&clock_,
+                                      &connection_factory_,
+                                      rmq_store_.get()));
 }
 
 void MCSClientTest::InitializeClient() {
   rmq_store_->Load(
       base::Bind(&MCSClient::Initialize,
                  base::Unretained(mcs_client_.get()),
                  base::Bind(&MCSClientTest::InitializationCallback,
                             base::Unretained(this)),
                  base::Bind(&MCSClientTest::MessageReceivedCallback,
                             base::Unretained(this)),
@@ skipping 43 matching lines @@
 }
 
 void MCSClientTest::MessageReceivedCallback(const MCSMessage& message) {
   received_message_.reset(new MCSMessage(message));
   DVLOG(1) << "Message received callback invoked, killing loop.";
   run_loop_->Quit();
 }
 
 void MCSClientTest::MessageSentCallback(const std::string& message_id) {
   DVLOG(1) << "Message sent callback invoked, killing loop.";
+  sent_message_id_ = message_id;
   run_loop_->Quit();
 }
 
 // Initialize a new client.
 TEST_F(MCSClientTest, InitializeNew) {
   BuildMCSClient();
   InitializeClient();
   EXPECT_EQ(0U, restored_android_id());
   EXPECT_EQ(0U, restored_security_token());
   EXPECT_TRUE(init_success());
@@ skipping 34 matching lines @@
   EXPECT_FALSE(connection_factory()->IsEndpointReachable());
   EXPECT_FALSE(init_success());
   EXPECT_FALSE(received_message());
 }
 
 // Send a message without RMQ support.
 TEST_F(MCSClientTest, SendMessageNoRMQ) {
   BuildMCSClient();
   InitializeClient();
   LoginClient(std::vector<std::string>());
-  MCSMessage message(BuildDataMessage("from", "category", 1, ""));
+  MCSMessage message(BuildDataMessage("from", "category", 1, "", 0, 0));
   GetFakeHandler()->ExpectOutgoingMessage(message);
-  mcs_client()->SendMessage(message, false);
+  mcs_client()->SendMessage(message);
   EXPECT_TRUE(GetFakeHandler()->
                   AllOutgoingMessagesReceived());
 }
 
+// Send a message without RMQ support while disconnected. Message send should
+// fail immediately, invoking callback.
+TEST_F(MCSClientTest, SendMessageNoRMQWhileDisconnected) {
+  BuildMCSClient();
+  InitializeClient();
+
+  EXPECT_TRUE(sent_message_id().empty());
+  MCSMessage message(BuildDataMessage("from", "category", 1, "", 0, 0));
+  mcs_client()->SendMessage(message);
+
+  // Message sent callback should be invoked, but no message should actually
+  // be sent.
+  EXPECT_FALSE(sent_message_id().empty());
+  EXPECT_TRUE(GetFakeHandler()->

[fgorski, 2013/12/28 01:15:08]

one line

[Nicolas Zea, 2013/12/30 21:46:19]

Done.

+                  AllOutgoingMessagesReceived());
+}
+
+
 // Send a message with RMQ support.
 TEST_F(MCSClientTest, SendMessageRMQ) {
   BuildMCSClient();
   InitializeClient();
   LoginClient(std::vector<std::string>());
-  MCSMessage message(BuildDataMessage("from", "category", 1, "1"));
+  MCSMessage message(
+      BuildDataMessage("from", "category", 1, "1", kTTLValue, 0));
   GetFakeHandler()->ExpectOutgoingMessage(message);
-  mcs_client()->SendMessage(message, true);
+  mcs_client()->SendMessage(message);
   EXPECT_TRUE(GetFakeHandler()->
                   AllOutgoingMessagesReceived());
 }
 
 // Send a message with RMQ support while disconnected. On reconnect, the message
 // should be resent.
 TEST_F(MCSClientTest, SendMessageRMQWhileDisconnected) {
   BuildMCSClient();
   InitializeClient();
   LoginClient(std::vector<std::string>());
   GetFakeHandler()->set_fail_send(true);
-  MCSMessage message(BuildDataMessage("from", "category", 1, "1"));
+  MCSMessage message(
+      BuildDataMessage("from", "category", 1, "1", kTTLValue, 0));
 
   // The initial (failed) send.
   GetFakeHandler()->ExpectOutgoingMessage(message);
   // The login request.
   GetFakeHandler()->ExpectOutgoingMessage(
       MCSMessage(kLoginRequestTag,
                  BuildLoginRequest(kAndroidId, kSecurityToken).
                      PassAs<const google::protobuf::MessageLite>()));
   // The second (re)send.
   GetFakeHandler()->ExpectOutgoingMessage(message);
-  mcs_client()->SendMessage(message, true);
+  mcs_client()->SendMessage(message);
   EXPECT_FALSE(GetFakeHandler()->
                   AllOutgoingMessagesReceived());
   GetFakeHandler()->set_fail_send(false);
   connection_factory()->Connect();
   WaitForMCSEvent();  // Wait for the login to finish.
   PumpLoop();         // Wait for the send to happen.
   EXPECT_TRUE(GetFakeHandler()->
                   AllOutgoingMessagesReceived());
 }
 
 // Send a message with RMQ support without receiving an acknowledgement. On
 // restart the message should be resent.
 TEST_F(MCSClientTest, SendMessageRMQOnRestart) {
   BuildMCSClient();
   InitializeClient();
   LoginClient(std::vector<std::string>());
   GetFakeHandler()->set_fail_send(true);
-  MCSMessage message(BuildDataMessage("from", "category", 1, "1"));
+  MCSMessage message(
+      BuildDataMessage("from", "category", 1, "1", kTTLValue, 0));
 
   // The initial (failed) send.
   GetFakeHandler()->ExpectOutgoingMessage(message);
   GetFakeHandler()->set_fail_send(false);
-  mcs_client()->SendMessage(message, true);
+  mcs_client()->SendMessage(message);
   EXPECT_TRUE(GetFakeHandler()->
                   AllOutgoingMessagesReceived());
 
   // Rebuild the client, which should resend the old message.
   BuildMCSClient();
   InitializeClient();
   LoginClient(std::vector<std::string>());
   GetFakeHandler()->ExpectOutgoingMessage(message);
   PumpLoop();
   EXPECT_TRUE(GetFakeHandler()->
                   AllOutgoingMessagesReceived());
 }
 
 // Send messages with RMQ support, followed by receiving a stream ack. On
 // restart nothing should be recent.
 TEST_F(MCSClientTest, SendMessageRMQWithStreamAck) {
   BuildMCSClient();
   InitializeClient();
   LoginClient(std::vector<std::string>());
 
   // Send some messages.
   for (int i = 1; i <= kMessageBatchSize; ++i) {
     MCSMessage message(
-        BuildDataMessage("from", "category", 1, base::IntToString(i)));
+        BuildDataMessage("from",
+                         "category",
+                         1,
+                         base::IntToString(i),
+                         kTTLValue,
+                         0));
     GetFakeHandler()->ExpectOutgoingMessage(message);
-    mcs_client()->SendMessage(message, true);
+    mcs_client()->SendMessage(message);
   }
   EXPECT_TRUE(GetFakeHandler()->
                   AllOutgoingMessagesReceived());
 
   // Receive the ack.
   scoped_ptr<mcs_proto::IqStanza> ack = BuildStreamAck();
   ack->set_last_stream_id_received(kMessageBatchSize + 1);
   GetFakeHandler()->ReceiveMessage(
       MCSMessage(kIqStanzaTag,
                  ack.PassAs<const google::protobuf::MessageLite>()));
@@ skipping 11 matching lines @@
 TEST_F(MCSClientTest, SendMessageRMQAckOnReconnect) {
   BuildMCSClient();
   InitializeClient();
   LoginClient(std::vector<std::string>());
 
   // Send some messages.
   std::vector<std::string> id_list;
   for (int i = 1; i <= kMessageBatchSize; ++i) {
     id_list.push_back(base::IntToString(i));
     MCSMessage message(
-        BuildDataMessage("from", "category", 1, id_list.back()));
+        BuildDataMessage("from", "category", 1, id_list.back(), kTTLValue, 0));
     GetFakeHandler()->ExpectOutgoingMessage(message);
-    mcs_client()->SendMessage(message, true);
+    mcs_client()->SendMessage(message);
   }
   EXPECT_TRUE(GetFakeHandler()->
                   AllOutgoingMessagesReceived());
 
   // Rebuild the client, and receive an acknowledgment for the messages as
   // part of the login response.
   BuildMCSClient();
   InitializeClient();
   LoginClient(std::vector<std::string>());
   scoped_ptr<mcs_proto::IqStanza> ack(BuildSelectiveAck(id_list));
@@ skipping 11 matching lines @@
 TEST_F(MCSClientTest, SendMessageRMQPartialAckOnReconnect) {
   BuildMCSClient();
   InitializeClient();
   LoginClient(std::vector<std::string>());
 
   // Send some messages.
   std::vector<std::string> id_list;
   for (int i = 1; i <= kMessageBatchSize; ++i) {
     id_list.push_back(base::IntToString(i));
     MCSMessage message(
-        BuildDataMessage("from", "category", 1, id_list.back()));
+        BuildDataMessage("from", "category", 1, id_list.back(), kTTLValue, 0));
     GetFakeHandler()->ExpectOutgoingMessage(message);
-    mcs_client()->SendMessage(message, true);
+    mcs_client()->SendMessage(message);
   }
   EXPECT_TRUE(GetFakeHandler()->
                   AllOutgoingMessagesReceived());
 
   // Rebuild the client, and receive an acknowledgment for the messages as
   // part of the login response.
   BuildMCSClient();
   InitializeClient();
   LoginClient(std::vector<std::string>());
 
   std::vector<std::string> acked_ids, remaining_ids;
   acked_ids.insert(acked_ids.end(),
                    id_list.begin(),
                    id_list.begin() + kMessageBatchSize / 2);
   remaining_ids.insert(remaining_ids.end(),
                        id_list.begin() + kMessageBatchSize / 2,
                        id_list.end());
   for (int i = 1; i <= kMessageBatchSize / 2; ++i) {
     MCSMessage message(
         BuildDataMessage("from",
                          "category",
                          2,
-                         remaining_ids[i - 1]));
+                         remaining_ids[i - 1],
+                         kTTLValue,
+                         0));
     GetFakeHandler()->ExpectOutgoingMessage(message);
   }
   scoped_ptr<mcs_proto::IqStanza> ack(BuildSelectiveAck(acked_ids));
   GetFakeHandler()->ReceiveMessage(
       MCSMessage(kIqStanzaTag,
                  ack.PassAs<const google::protobuf::MessageLite>()));
   WaitForMCSEvent();
   EXPECT_TRUE(GetFakeHandler()->
                   AllOutgoingMessagesReceived());
 }
 
 // Receive some messages. On restart, the login request should contain the
 // appropriate acknowledged ids.
 TEST_F(MCSClientTest, AckOnLogin) {
   BuildMCSClient();
   InitializeClient();
   LoginClient(std::vector<std::string>());
 
   // Receive some messages.
   std::vector<std::string> id_list;
   for (int i = 1; i <= kMessageBatchSize; ++i) {
     id_list.push_back(base::IntToString(i));
     MCSMessage message(
-        BuildDataMessage("from", "category", i, id_list.back()));
+        BuildDataMessage("from", "category", i, id_list.back(), kTTLValue, 0));
     GetFakeHandler()->ReceiveMessage(message);
     WaitForMCSEvent();
     PumpLoop();
   }
 
   // Restart the client.
   BuildMCSClient();
   InitializeClient();
   LoginClient(id_list);
 }
 
 // Receive some messages. On the next send, the outgoing message should contain
 // the appropriate last stream id received field to ack the received messages.
 TEST_F(MCSClientTest, AckOnSend) {
   BuildMCSClient();
   InitializeClient();
   LoginClient(std::vector<std::string>());
 
   // Receive some messages.
   std::vector<std::string> id_list;
   for (int i = 1; i <= kMessageBatchSize; ++i) {
     id_list.push_back(base::IntToString(i));
     MCSMessage message(
-        BuildDataMessage("from", "category", i, id_list.back()));
+        BuildDataMessage("from", "category", i, id_list.back(), kTTLValue, 0));
     GetFakeHandler()->ReceiveMessage(message);
     WaitForMCSEvent();
     PumpLoop();
   }
 
   // Trigger a message send, which should acknowledge via stream ack.
   MCSMessage message(
-      BuildDataMessage("from", "category", kMessageBatchSize + 1, "1"));
+      BuildDataMessage("from",
+                       "category",
+                       kMessageBatchSize + 1,
+                       "1",
+                       kTTLValue,
+                       0));
   GetFakeHandler()->ExpectOutgoingMessage(message);
-  mcs_client()->SendMessage(message, true);
+  mcs_client()->SendMessage(message);
   EXPECT_TRUE(GetFakeHandler()->
                   AllOutgoingMessagesReceived());
 }
 
 // Receive the ack limit in messages, which should trigger an automatic
 // stream ack. Receive a heartbeat to confirm the ack.
 TEST_F(MCSClientTest, AckWhenLimitReachedWithHeartbeat) {
   BuildMCSClient();
   InitializeClient();
   LoginClient(std::vector<std::string>());
 
   // The stream ack.
   scoped_ptr<mcs_proto::IqStanza> ack = BuildStreamAck();
   ack->set_last_stream_id_received(kAckLimitSize + 1);
   GetFakeHandler()->ExpectOutgoingMessage(
       MCSMessage(kIqStanzaTag,
                  ack.PassAs<const google::protobuf::MessageLite>()));
 
   // Receive some messages.
   std::vector<std::string> id_list;
   for (int i = 1; i <= kAckLimitSize; ++i) {
     id_list.push_back(base::IntToString(i));
     MCSMessage message(
-        BuildDataMessage("from", "category", i, id_list.back()));
+        BuildDataMessage("from", "category", i, id_list.back(), kTTLValue, 0));
     GetFakeHandler()->ReceiveMessage(message);
     WaitForMCSEvent();
     PumpLoop();
   }
   EXPECT_TRUE(GetFakeHandler()->
                   AllOutgoingMessagesReceived());
 
   // Receive a heartbeat confirming the ack (and receive the heartbeat ack).
   scoped_ptr<mcs_proto::HeartbeatPing> heartbeat(
       new mcs_proto::HeartbeatPing());
@@ skipping 14 matching lines @@
                   AllOutgoingMessagesReceived());
 
   // Rebuild the client. Nothing should be sent on login.
   BuildMCSClient();
   InitializeClient();
   LoginClient(std::vector<std::string>());
   EXPECT_TRUE(GetFakeHandler()->
                   AllOutgoingMessagesReceived());
 }
 
+// If a message's TTL has expired by the time it reaches the front of the send
+// queue, it should be dropped.
+TEST_F(MCSClientTest, ExpiredTTLOnSend) {
+  BuildMCSClient();
+  InitializeClient();
+  LoginClient(std::vector<std::string>());
+  MCSMessage message(
+      BuildDataMessage("from", "category", 1, "1", kTTLValue, 0));
+
+  // Advance time to after the TTL.
+  clock()->Advance(base::TimeDelta::FromSeconds(kTTLValue + 1));
+  EXPECT_TRUE(sent_message_id().empty());
+  mcs_client()->SendMessage(message);
+
+  // No messages should be sent, but the callback should still be invoked.
+  EXPECT_FALSE(sent_message_id().empty());
+  EXPECT_TRUE(GetFakeHandler()->

[fgorski, 2013/12/28 01:15:08]

one line. fix other places.

[Nicolas Zea, 2013/12/30 21:46:19]

Done.

+                  AllOutgoingMessagesReceived());
+}
+
+TEST_F(MCSClientTest, ExpiredTTLOnRestart) {
+  BuildMCSClient();
+  InitializeClient();
+  LoginClient(std::vector<std::string>());
+  GetFakeHandler()->set_fail_send(true);
+  MCSMessage message(
+      BuildDataMessage("from", "category", 1, "1", kTTLValue, 0));
+
+  // The initial (failed) send.
+  GetFakeHandler()->ExpectOutgoingMessage(message);
+  GetFakeHandler()->set_fail_send(false);
+  mcs_client()->SendMessage(message);
+  EXPECT_TRUE(GetFakeHandler()->
+                  AllOutgoingMessagesReceived());
+
+  // Move the clock forward and rebuild the client, which should fail the
+  // message send on restart.
+  clock()->Advance(base::TimeDelta::FromSeconds(kTTLValue + 1));
+  BuildMCSClient();
+  InitializeClient();
+  LoginClient(std::vector<std::string>());
+  PumpLoop();
+  EXPECT_FALSE(sent_message_id().empty());
+  EXPECT_TRUE(GetFakeHandler()->
+                  AllOutgoingMessagesReceived());
+}
+
 } // namespace
 
 }  // namespace gcm