Implement Invalidator::Acknowledge

chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h"
 #include "chrome/browser/sync/invalidation_frontend.h"
 #include "google/cacheinvalidation/types.pb.h"
+#include "sync/internal_api/public/base/invalidation_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::NotNull;
 using ::testing::SaveArg;
 using ::testing::StrictMock;
 
 namespace extensions {
 
 namespace {
 
 class MockInvalidationFrontend : public InvalidationFrontend {
  public:
   MockInvalidationFrontend();
   ~MockInvalidationFrontend();
   MOCK_METHOD1(RegisterInvalidationHandler,
                void(syncer::InvalidationHandler*));
   MOCK_METHOD2(UpdateRegisteredInvalidationIds,
                void(syncer::InvalidationHandler*, const syncer::ObjectIdSet&));
   MOCK_METHOD1(UnregisterInvalidationHandler,
                void(syncer::InvalidationHandler*));
+  MOCK_METHOD2(AcknowledgeInvalidation, void(const invalidation::ObjectId&,
+                                             const syncer::AckHandle&));
   MOCK_CONST_METHOD0(GetInvalidatorState, syncer::InvalidatorState());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockInvalidationFrontend);
 };
 
 MockInvalidationFrontend::MockInvalidationFrontend() {}
 MockInvalidationFrontend::~MockInvalidationFrontend() {}
 
 class MockInvalidationHandlerDelegate
@@ skipping 60 matching lines @@
   ids.insert(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::CHROME_PUSH_MESSAGING,
       "U/dddddddddddddddddddddddddddddddd/0"));
   ids.insert(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::CHROME_PUSH_MESSAGING,
       "U/dddddddddddddddddddddddddddddddd/3"));
   EXPECT_CALL(delegate_,
               OnMessage("dddddddddddddddddddddddddddddddd", 0, "payload"));
   EXPECT_CALL(delegate_,
               OnMessage("dddddddddddddddddddddddddddddddd", 3, "payload"));
+  for (syncer::ObjectIdSet::const_iterator it = ids.begin(); it != ids.end();
+       ++it) {
+    EXPECT_CALL(service_, AcknowledgeInvalidation(
+        *it, syncer::AckHandle::InvalidAckHandle()));
+  }
   handler_->OnIncomingInvalidation(
       ObjectIdSetToInvalidationMap(ids, "payload"));
 }
 
 // Tests that malformed object IDs don't trigger spurious callbacks.
 TEST_F(PushMessagingInvalidationHandlerTest, DispatchInvalidObjectIds) {
   syncer::ObjectIdSet ids;
   // Completely incorrect format.
   ids.insert(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::TEST,
@@ skipping 11 matching lines @@
       ipc::invalidation::ObjectSource::CHROME_PUSH_MESSAGING,
       "U/ddddddddddddddddddddddddddddddddd/3"));
   // Non-numeric subchannel.
   ids.insert(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::CHROME_PUSH_MESSAGING,
       "U/dddddddddddddddddddddddddddddddd/z"));
   // Subchannel out of range.
   ids.insert(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::CHROME_PUSH_MESSAGING,
       "U/dddddddddddddddddddddddddddddddd/4"));
+  // Invalid object IDs should still be acknowledged though.

[akalin, 2013/02/15 22:32:12]

i think you can leave off 'though'

[dcheng, 2013/02/22 02:51:30]

Done.

+  for (syncer::ObjectIdSet::const_iterator it = ids.begin(); it != ids.end();
+       ++it) {
+    EXPECT_CALL(service_, AcknowledgeInvalidation(
+        *it, syncer::AckHandle::InvalidAckHandle()));
+  }
   handler_->OnIncomingInvalidation(
       ObjectIdSetToInvalidationMap(ids, "payload"));
 }
 
 }  // namespace extensions